mirror of
https://abf.rosa.ru/djam/kernel-5.13.git
synced 2025-02-25 16:12:50 +00:00
Updated to version 3.14.10
The relevant parts of the .spec and other files have been synced to what Nicolo' Costanza <abitrules@yahoo.it> has prepared.
This commit is contained in:
parent
20178159ab
commit
a6f5689f8f
8 changed files with 129 additions and 153 deletions
6
.abf.yml
6
.abf.yml
|
@ -1,4 +1,4 @@
|
||||||
sources:
|
sources:
|
||||||
linux-3.10.46-rosa69.tar.xz: 95caa74b406a64027fe0506e5b5c4508c4cffea8
|
"linux-3.14.10-rosa69.tar.xz": c07bed45c5d96e553ef7fd98d8d3878a180a589d
|
||||||
linux-3.10.tar.xz: a649d5c15f68ccbae1c4863e357bdc48da4cc0b4
|
"linux-3.14.tar.xz": fc777520e5976caf0d5513502b8156f73748e379
|
||||||
patch-3.10.46.xz: 7fe177856130d6cf9fa371c4f0511d16b313598b
|
"patch-3.14.10.xz": f8bd8cf86b35c7419cbb5695a486c338dba97d6c
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
Hello Mageia Users,
|
Hello Mandriva, OpenMandriva, MagOS and Rosa Linux Users,
|
||||||
|
|
||||||
linux-userspace-headers contains the headers for the source code of
|
linux-userspace-headers contains the headers for the source code of
|
||||||
Linux kernel. All source code necessary to compile a new kernel is
|
Linux kernel. All source code necessary to compile a new kernel is
|
||||||
|
@ -88,3 +88,4 @@ Enjoy!
|
||||||
(c) 1999-2006 Mandriva, Camille Bégnis <camille@mandriva.com>
|
(c) 1999-2006 Mandriva, Camille Bégnis <camille@mandriva.com>
|
||||||
(c) 2006 Thomas Backlund <tmb@mandriva.org>
|
(c) 2006 Thomas Backlund <tmb@mandriva.org>
|
||||||
(c) 2011 Thomas Backlund <tmb@mageia.org>
|
(c) 2011 Thomas Backlund <tmb@mageia.org>
|
||||||
|
(c) 2011 Nicolò Costanza <abitrules@yahoo.it>
|
||||||
|
|
|
@ -3,10 +3,10 @@
|
||||||
scripts/kconfig/Makefile | 19 -------------------
|
scripts/kconfig/Makefile | 19 -------------------
|
||||||
2 files changed, 12 insertions(+), 31 deletions(-)
|
2 files changed, 12 insertions(+), 31 deletions(-)
|
||||||
|
|
||||||
diff -Nurp linux-3.10.1-mga1/Makefile linux-3.10.1-mga1.mrp/Makefile
|
diff -Nurp linux-3.14.2-1.mga4/Makefile linux-3.14.2-1.mga4.mrproper/Makefile
|
||||||
--- linux-3.10.1-mga1/Makefile 2013-07-14 19:13:58.126152807 +0300
|
--- linux-3.14.2-1.mga4/Makefile 2014-04-26 18:57:12.134824274 +0300
|
||||||
+++ linux-3.10.1-mga1.mrp/Makefile 2013-07-14 19:16:14.385315249 +0300
|
+++ linux-3.14.2-1.mga4.mrproper/Makefile 2014-04-26 18:58:36.410828557 +0300
|
||||||
@@ -513,9 +513,7 @@ ifeq ($(KBUILD_EXTMOD),)
|
@@ -522,9 +522,7 @@ ifeq ($(KBUILD_EXTMOD),)
|
||||||
# Carefully list dependencies so we do not try to build scripts twice
|
# Carefully list dependencies so we do not try to build scripts twice
|
||||||
# in parallel
|
# in parallel
|
||||||
PHONY += scripts
|
PHONY += scripts
|
||||||
|
@ -17,7 +17,7 @@ diff -Nurp linux-3.10.1-mga1/Makefile linux-3.10.1-mga1.mrp/Makefile
|
||||||
|
|
||||||
# Objects we will link into vmlinux / subdirs we need to visit
|
# Objects we will link into vmlinux / subdirs we need to visit
|
||||||
init-y := init/
|
init-y := init/
|
||||||
@@ -835,7 +833,7 @@ prepare0: archprepare FORCE
|
@@ -884,7 +882,7 @@ prepare0: archprepare FORCE
|
||||||
$(Q)$(MAKE) $(build)=.
|
$(Q)$(MAKE) $(build)=.
|
||||||
|
|
||||||
# All the preparing..
|
# All the preparing..
|
||||||
|
@ -26,7 +26,7 @@ diff -Nurp linux-3.10.1-mga1/Makefile linux-3.10.1-mga1.mrp/Makefile
|
||||||
|
|
||||||
# Generate some files
|
# Generate some files
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
@@ -1017,13 +1015,15 @@ endif # CONFIG_MODULES
|
@@ -1066,13 +1064,15 @@ endif # CONFIG_MODULES
|
||||||
CLEAN_DIRS += $(MODVERDIR)
|
CLEAN_DIRS += $(MODVERDIR)
|
||||||
|
|
||||||
# Directories & files removed with 'make mrproper'
|
# Directories & files removed with 'make mrproper'
|
||||||
|
@ -49,7 +49,7 @@ diff -Nurp linux-3.10.1-mga1/Makefile linux-3.10.1-mga1.mrp/Makefile
|
||||||
|
|
||||||
# clean - Delete most, but leave enough to build external modules
|
# clean - Delete most, but leave enough to build external modules
|
||||||
#
|
#
|
||||||
@@ -1044,7 +1044,7 @@ clean: archclean vmlinuxclean
|
@@ -1093,7 +1093,7 @@ clean: archclean vmlinuxclean
|
||||||
#
|
#
|
||||||
mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS))
|
mrproper: rm-dirs := $(wildcard $(MRPROPER_DIRS))
|
||||||
mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
|
mrproper: rm-files := $(wildcard $(MRPROPER_FILES))
|
||||||
|
@ -58,9 +58,9 @@ diff -Nurp linux-3.10.1-mga1/Makefile linux-3.10.1-mga1.mrp/Makefile
|
||||||
|
|
||||||
PHONY += $(mrproper-dirs) mrproper archmrproper
|
PHONY += $(mrproper-dirs) mrproper archmrproper
|
||||||
$(mrproper-dirs):
|
$(mrproper-dirs):
|
||||||
diff -Nurp linux-3.10.1-mga1/scripts/kconfig/Makefile linux-3.10.1-mga1.mrp/scripts/kconfig/Makefile
|
diff -Nurp linux-3.14.2-1.mga4/scripts/kconfig/Makefile linux-3.14.2-1.mga4.mrproper/scripts/kconfig/Makefile
|
||||||
--- linux-3.10.1-mga1/scripts/kconfig/Makefile 2013-07-14 19:13:58.126152807 +0300
|
--- linux-3.14.2-1.mga4/scripts/kconfig/Makefile 2014-04-26 18:57:12.134824274 +0300
|
||||||
+++ linux-3.10.1-mga1.mrp/scripts/kconfig/Makefile 2013-07-14 19:16:14.386315260 +0300
|
+++ linux-3.14.2-1.mga4.mrproper/scripts/kconfig/Makefile 2014-04-26 18:58:36.411828571 +0300
|
||||||
@@ -15,26 +15,18 @@ endif
|
@@ -15,26 +15,18 @@ endif
|
||||||
unexport CONFIG_
|
unexport CONFIG_
|
||||||
|
|
||||||
|
|
195
kernel-1.spec
195
kernel-1.spec
|
@ -1,8 +1,8 @@
|
||||||
#
|
#
|
||||||
%define kernelversion 3
|
%define kernelversion 3
|
||||||
%define patchlevel 10
|
%define patchlevel 14
|
||||||
# sublevel is now used for -stable patches
|
# sublevel is now used for -stable patches
|
||||||
%define sublevel 46
|
%define sublevel 10
|
||||||
|
|
||||||
# Package release
|
# Package release
|
||||||
%define mibrel 69
|
%define mibrel 69
|
||||||
|
@ -28,7 +28,7 @@
|
||||||
%define rpmrel %mkrel 0.%{kpatch}.%{mibrel}
|
%define rpmrel %mkrel 0.%{kpatch}.%{mibrel}
|
||||||
%endif
|
%endif
|
||||||
%else
|
%else
|
||||||
%define rpmrel 3
|
%define rpmrel 1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# fakerel and fakever never change, they are used to fool
|
# fakerel and fakever never change, they are used to fool
|
||||||
|
@ -127,6 +127,9 @@
|
||||||
# Build nrj realtime (i686 / 4GB) / x86_64
|
# Build nrj realtime (i686 / 4GB) / x86_64
|
||||||
%define build_nrj_realtime 1
|
%define build_nrj_realtime 1
|
||||||
|
|
||||||
|
# Build nrj server (i686 / 4GB) / x86_64
|
||||||
|
%define build_nrj_server 0
|
||||||
|
|
||||||
# Build nrj laptop (i686 / 4GB) / x86_64
|
# Build nrj laptop (i686 / 4GB) / x86_64
|
||||||
%define build_nrj_laptop 1
|
%define build_nrj_laptop 1
|
||||||
|
|
||||||
|
@ -178,17 +181,7 @@
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
#
|
#
|
||||||
# experimental optimized "nrj" for server ABF & LXC vms
|
# end of experimental "cpu level" optimized "nrj" flavours
|
||||||
#
|
|
||||||
|
|
||||||
# Build nrj server lxc (i686 / 4GB) / x86_64 / sparc64 sets
|
|
||||||
%define build_nrj_server_lxc 0
|
|
||||||
|
|
||||||
# Build nrj server lxc exp (i686 / 4GB) / x86_64 / sparc64 sets
|
|
||||||
%define build_nrj_server_lxc_exp 0
|
|
||||||
|
|
||||||
#
|
|
||||||
# end of kernel name flavour definitions
|
|
||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
@ -226,6 +219,7 @@
|
||||||
%{?_without_nrj_desktop586: %global build_nrj_desktop586 0}
|
%{?_without_nrj_desktop586: %global build_nrj_desktop586 0}
|
||||||
%{?_without_nrj_desktop: %global build_nrj_desktop 0}
|
%{?_without_nrj_desktop: %global build_nrj_desktop 0}
|
||||||
%{?_without_nrj_realtime: %global build_nrj_realtime 0}
|
%{?_without_nrj_realtime: %global build_nrj_realtime 0}
|
||||||
|
%{?_without_nrj_server: %global build_nrj_server 0}
|
||||||
%{?_without_nrj_laptop: %global build_nrj_laptop 0}
|
%{?_without_nrj_laptop: %global build_nrj_laptop 0}
|
||||||
%{?_without_nrj_netbook: %global build_nrj_netbook 0}
|
%{?_without_nrj_netbook: %global build_nrj_netbook 0}
|
||||||
|
|
||||||
|
@ -239,9 +233,6 @@
|
||||||
%{?_without_nrj_desktop_core2: %global build_nrj_desktop_core2 0}
|
%{?_without_nrj_desktop_core2: %global build_nrj_desktop_core2 0}
|
||||||
%{?_without_nrj_desktop_core2_pae: %global build_nrj_desktop_core2_pae 0}
|
%{?_without_nrj_desktop_core2_pae: %global build_nrj_desktop_core2_pae 0}
|
||||||
|
|
||||||
%{?_without_nrj_server_lxc: %global build_nrj_server_lxc 0}
|
|
||||||
%{?_without_nrj_server_lxc_exp: %global build_nrj_server_lxc_exp 0}
|
|
||||||
|
|
||||||
%{?_without_doc: %global build_doc 0}
|
%{?_without_doc: %global build_doc 0}
|
||||||
%{?_without_source: %global build_source 0}
|
%{?_without_source: %global build_source 0}
|
||||||
%{?_without_devel: %global build_devel 0}
|
%{?_without_devel: %global build_devel 0}
|
||||||
|
@ -262,6 +253,7 @@
|
||||||
%{?_with_nrj_desktop586: %global build_nrj_desktop586 1}
|
%{?_with_nrj_desktop586: %global build_nrj_desktop586 1}
|
||||||
%{?_with_nrj_desktop: %global build_nrj_desktop 1}
|
%{?_with_nrj_desktop: %global build_nrj_desktop 1}
|
||||||
%{?_with_nrj_realtime: %global build_nrj_realtime 1}
|
%{?_with_nrj_realtime: %global build_nrj_realtime 1}
|
||||||
|
%{?_with_nrj_server: %global build_nrj_server 1}
|
||||||
%{?_with_nrj_laptop: %global build_nrj_laptop 1}
|
%{?_with_nrj_laptop: %global build_nrj_laptop 1}
|
||||||
%{?_with_nrj_netbook: %global build_nrj_netbook 1}
|
%{?_with_nrj_netbook: %global build_nrj_netbook 1}
|
||||||
|
|
||||||
|
@ -275,9 +267,6 @@
|
||||||
%{?_with_nrj_desktop_core2: %global build_nrj_desktop_core2 1}
|
%{?_with_nrj_desktop_core2: %global build_nrj_desktop_core2 1}
|
||||||
%{?_with_nrj_desktop_core2_pae: %global build_nrj_desktop_core2_pae 1}
|
%{?_with_nrj_desktop_core2_pae: %global build_nrj_desktop_core2_pae 1}
|
||||||
|
|
||||||
%{?_with_nrj_server_lxc: %global build_nrj_server_lxc 1}
|
|
||||||
%{?_with_nrj_server_lxc_exp: %global build_nrj_server_lxc_exp 1}
|
|
||||||
|
|
||||||
%{?_with_doc: %global build_doc 1}
|
%{?_with_doc: %global build_doc 1}
|
||||||
%{?_with_source: %global build_source 1}
|
%{?_with_source: %global build_source 1}
|
||||||
%{?_with_devel: %global build_devel 1}
|
%{?_with_devel: %global build_devel 1}
|
||||||
|
@ -300,7 +289,7 @@
|
||||||
%{?_with_nosrc: %global build_nosrc 1}
|
%{?_with_nosrc: %global build_nosrc 1}
|
||||||
|
|
||||||
############################################################
|
############################################################
|
||||||
### Linker start1 > Check point to build for cooker 2013 ###
|
### Linker start1 > Check point to build for omv or rosa ###
|
||||||
############################################################
|
############################################################
|
||||||
%if %(if [ -z "$CC" ] ; then echo 0; else echo 1; fi)
|
%if %(if [ -z "$CC" ] ; then echo 0; else echo 1; fi)
|
||||||
%define kmake %make CC="$CC"
|
%define kmake %make CC="$CC"
|
||||||
|
@ -311,7 +300,7 @@
|
||||||
%define smake make
|
%define smake make
|
||||||
|
|
||||||
###########################################################
|
###########################################################
|
||||||
### Linker end1 > Check point to build for cooker 2013 ###
|
### Linker end1 > Check point to build for omv or rosa ###
|
||||||
###########################################################
|
###########################################################
|
||||||
|
|
||||||
# Parallelize xargs invocations on smp machines
|
# Parallelize xargs invocations on smp machines
|
||||||
|
@ -430,49 +419,56 @@ processor mode, use the "nosmp" boot parameter.
|
||||||
# conflict dkms packages that dont support kernel-3.10
|
# conflict dkms packages that dont support kernel-3.10
|
||||||
# all driver versions must be carefully checked to add
|
# all driver versions must be carefully checked to add
|
||||||
|
|
||||||
%define kconflicts1 dkms-broadcom-wl < 5.100.82.112-12
|
%define kconflicts1 dkms-broadcom-wl < 6.30.223.141-6
|
||||||
%define kconflicts2 dkms-fglrx < 13.200.5-1
|
%define kconflicts2 dkms-fglrx < 14.10.1006.1001-1
|
||||||
%define kconflicts3 dkms-nvidia-current < 325.15-2
|
%define kconflicts3 dkms-nvidia-current < 331.38-5
|
||||||
%define kconflicts4 dkms-nvidia-long-lived < 304.108-1
|
%define kconflicts4 dkms-nvidia-long-lived < 304.108-8
|
||||||
%define kconflicts5 dkms-nvidia173 < 173.14.37-4
|
%define kconflicts5 dkms-nvidia173 < 173.14.39-3
|
||||||
# nvidia96xx does not support this kernel or x11-server-1.13
|
# nvidia96xx does not support this kernel or x11-server-1.13
|
||||||
|
|
||||||
Autoreqprov: no
|
Autoreqprov: no
|
||||||
|
|
||||||
# might be useful too:
|
BuildRequires: bc
|
||||||
Suggests: microcode
|
BuildRequires: binutils
|
||||||
|
BuildRequires: gcc
|
||||||
|
# For power tools
|
||||||
|
BuildRequires: pkgconfig(ncurses)
|
||||||
|
|
||||||
BuildRequires: kmod-devel kmod-compat
|
BuildRequires: kmod-devel kmod-compat
|
||||||
BuildRequires: gcc bc
|
|
||||||
|
|
||||||
BuildRequires: audit-devel
|
|
||||||
|
|
||||||
%ifarch x86_64
|
%ifarch x86_64
|
||||||
BuildRequires: numa-devel
|
BuildRequires: numa-devel
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
BuildRequires: libunwind-devel
|
# for perf, cpufreq and all other tools
|
||||||
|
# for cpupower
|
||||||
# for perf, cpufreq and other tools
|
%if %{build_cpupower}
|
||||||
BuildRequires: elfutils-devel
|
|
||||||
BuildRequires: zlib-devel
|
|
||||||
BuildRequires: binutils-devel
|
|
||||||
BuildRequires: newt-devel
|
|
||||||
BuildRequires: python-devel
|
|
||||||
BuildRequires: perl(ExtUtils::Embed)
|
|
||||||
BuildRequires: pciutils-devel
|
BuildRequires: pciutils-devel
|
||||||
|
%endif
|
||||||
|
# for perf
|
||||||
|
%if %{build_perf}
|
||||||
BuildRequires: asciidoc
|
BuildRequires: asciidoc
|
||||||
BuildRequires: xmlto
|
BuildRequires: audit-devel
|
||||||
BuildRequires: gettext
|
BuildRequires: binutils-devel
|
||||||
BuildRequires: docbook-style-xsl
|
|
||||||
BuildRequires: pkgconfig(gtk+-2.0)
|
|
||||||
BuildRequires: flex
|
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
|
BuildRequires: elfutils-devel
|
||||||
|
BuildRequires: flex
|
||||||
|
BuildRequires: libunwind-devel
|
||||||
|
BuildRequires: newt-devel
|
||||||
|
BuildRequires: perl-devel
|
||||||
|
BuildRequires: pkgconfig(gtk+-2.0)
|
||||||
|
BuildRequires: python-devel
|
||||||
|
BuildRequires: xmlto
|
||||||
|
BuildRequires: zlib-devel
|
||||||
|
%endif
|
||||||
|
|
||||||
%ifarch %{arm}
|
%ifarch %{arm}
|
||||||
BuildRequires: uboot-mkimage
|
BuildRequires: uboot-mkimage
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
# might be useful too:
|
||||||
|
Suggests: microcode
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
%common_desc_kernel
|
%common_desc_kernel
|
||||||
|
@ -672,12 +668,12 @@ voluntary preempt, CFS cpu scheduler and BFQ i/o scheduler, ONDEMAND governor.
|
||||||
%define summary_server Linux Kernel for server use with i686 & 64GB RAM
|
%define summary_server Linux Kernel for server use with i686 & 64GB RAM
|
||||||
%define info_server This kernel is compiled for server use, single or \
|
%define info_server This kernel is compiled for server use, single or \
|
||||||
multiple i686 processor(s)/core(s) and up to 64GB RAM using PAE, using \
|
multiple i686 processor(s)/core(s) and up to 64GB RAM using PAE, using \
|
||||||
no preempt, HZ_100, CFS cpu scheduler and BFQ i/o scheduler, PERFORMANCE governor.
|
no preempt, HZ_100, CFS cpu scheduler and CFQ i/o scheduler, ONDEMAND governor.
|
||||||
%else
|
%else
|
||||||
%define summary_server Linux Kernel for server use with %{_arch}
|
%define summary_server Linux Kernel for server use with %{_arch}
|
||||||
%define info_server This kernel is compiled for server use, single or \
|
%define info_server This kernel is compiled for server use, single or \
|
||||||
multiple %{_arch} processor(s)/core(s), using no preempt, HZ_100, \
|
multiple %{_arch} processor(s)/core(s), using no preempt, HZ_100, \
|
||||||
CFS cpu scheduler and BFQ i/o scheduler, PERFORMANCE governor.
|
CFS cpu scheduler and CFQ i/o scheduler, ONDEMAND governor.
|
||||||
%endif
|
%endif
|
||||||
%mkflavour server
|
%mkflavour server
|
||||||
%endif
|
%endif
|
||||||
|
@ -757,6 +753,24 @@ full preempt, rcu boost, CFS cpu scheduler and new BFQ I/O scheduler, PERFORMANC
|
||||||
%mkflavour nrj-realtime
|
%mkflavour nrj-realtime
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
#
|
||||||
|
# kernel-nrj-server: i686, smp-alternatives, 64 GB / x86_64
|
||||||
|
#
|
||||||
|
%if %build_nrj_server
|
||||||
|
%ifarch %{ix86}
|
||||||
|
%define summary_nrj_server Linux Kernel for server use with i686 & 64GB RAM
|
||||||
|
%define info_nrj_server This kernel is compiled for server use, single or \
|
||||||
|
multiple i686 processor(s)/core(s) and up to 64GB RAM using PAE, using \
|
||||||
|
no preempt, HZ_100, CFS cpu scheduler and BFQ i/o scheduler, ONDEMAND governor.
|
||||||
|
%else
|
||||||
|
%define summary_nrj_server Linux Kernel for server use with %{_arch}
|
||||||
|
%define info_nrj_server This kernel is compiled for server use, single or \
|
||||||
|
multiple %{_arch} processor(s)/core(s), using no preempt, HZ_100, \
|
||||||
|
CFS cpu scheduler and BFQ i/o scheduler, ONDEMAND governor.
|
||||||
|
%endif
|
||||||
|
%mkflavour nrj-server
|
||||||
|
%endif
|
||||||
|
|
||||||
#
|
#
|
||||||
# kernel-nrj-laptop: nrj, i686, smp-alternatives, 4 GB / x86_64
|
# kernel-nrj-laptop: nrj, i686, smp-alternatives, 4 GB / x86_64
|
||||||
#
|
#
|
||||||
|
@ -905,46 +919,6 @@ full preempt, rcu boost, CFS cpu scheduler and BFQ i/o scheduler, ONDEMAND gover
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
#
|
|
||||||
# kernel-nrj-server-lxc: i686, smp-alternatives, 64 GB / x86_64
|
|
||||||
#
|
|
||||||
%if %build_nrj_server_lxc
|
|
||||||
%ifarch %{ix86}
|
|
||||||
%define summary_nrj_server_lxc Linux Kernel for server use with i686 & 64GB RAM
|
|
||||||
%define info_nrj_server_lxc This kernel is compiled for server use, single or \
|
|
||||||
multiple i686 processor(s)/core(s) and up to 64GB RAM using PAE, no Preempt, \
|
|
||||||
HZ_100, Tickless, CFS cpu scheduler and BFQ i/o scheduler, PERFORMANCE governor. \
|
|
||||||
This is a special flavour prepared for ROSA ABF server and LXC VMs.
|
|
||||||
%else
|
|
||||||
%define summary_nrj_server_lxc Linux Kernel for server use with %{_arch}
|
|
||||||
%define info_nrj_server_lxc This kernel is compiled for server use, single or \
|
|
||||||
multiple %{_arch} processor(s)/core(s), using no Preempt, HZ_100, Tickless, \
|
|
||||||
CFS cpu scheduler and BFQ i/o scheduler, with PERFORMANCE governor. \
|
|
||||||
This is a special flavour prepared for ROSA ABF server and LXC VMs.
|
|
||||||
%endif
|
|
||||||
%mkflavour nrj-server-lxc
|
|
||||||
%endif
|
|
||||||
|
|
||||||
#
|
|
||||||
# kernel-nrj-server-lxc-exp: i686, smp-alternatives, 64 GB / x86_64
|
|
||||||
#
|
|
||||||
%if %build_nrj_server_lxc_exp
|
|
||||||
%ifarch %{ix86}
|
|
||||||
%define summary_nrj_server_lxc_exp Linux Kernel for server use with i686 & 64GB RAM
|
|
||||||
%define info_nrj_server_lxc_exp This kernel is compiled for server use, single or \
|
|
||||||
multiple i686 processor(s)/core(s) and up to 64GB RAM using PAE, using full Preeempt, \
|
|
||||||
HZ_1000, Tickless, CFS cpu scheduler and BFQ i/o scheduler, with PERFORMANCE governor. \
|
|
||||||
This is a special flavour prepared for ROSA ABF server and LXC VMs.
|
|
||||||
%else
|
|
||||||
%define summary_nrj_server_lxc_exp Linux Kernel for server use with %{_arch}
|
|
||||||
%define info_nrj_server_lxc_exp This kernel is compiled for server use, single or \
|
|
||||||
multiple %{_arch} processor(s)/core(s), using full Preempt, HZ_1000, Tickless, \
|
|
||||||
CFS cpu scheduler and BFQ i/o scheduler, with PERFORMANCE governor. \
|
|
||||||
This is a special flavour prepared for ROSA ABF server and LXC VMs.
|
|
||||||
%endif
|
|
||||||
%mkflavour nrj-server-lxc-exp
|
|
||||||
%endif
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# ARM kernels
|
# ARM kernels
|
||||||
#
|
#
|
||||||
|
@ -1128,9 +1102,10 @@ cd %src_dir
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%{patches_dir}/scripts/apply_patches
|
%{patches_dir}/scripts/apply_patches
|
||||||
%{patches_dir}/scripts/apply_patches-backlight
|
|
||||||
%{patches_dir}/scripts/apply_patches-NRJ
|
%{patches_dir}/scripts/apply_patches-NRJ
|
||||||
# %{patches_dir}/scripts/apply_patches-NRJ-only
|
# %{patches_dir}/scripts/apply_patches-NRJ-only
|
||||||
|
%{patches_dir}/scripts/apply_patches-geek
|
||||||
|
%{patches_dir}/scripts/apply_patches-latest
|
||||||
# %{patches_dir}/scripts/apply_patches-QL
|
# %{patches_dir}/scripts/apply_patches-QL
|
||||||
# PATCH END
|
# PATCH END
|
||||||
|
|
||||||
|
@ -1257,7 +1232,7 @@ SaveDevel() {
|
||||||
for i in $(find . -name 'Makefile*'); do cp -R --parents $i $TempDevelRoot;done
|
for i in $(find . -name 'Makefile*'); do cp -R --parents $i $TempDevelRoot;done
|
||||||
for i in $(find . -name 'Kconfig*' -o -name 'Kbuild*'); do cp -R --parents $i $TempDevelRoot;done
|
for i in $(find . -name 'Kconfig*' -o -name 'Kbuild*'); do cp -R --parents $i $TempDevelRoot;done
|
||||||
cp -fR include $TempDevelRoot
|
cp -fR include $TempDevelRoot
|
||||||
ln -s ../generated/uapi/linux/version.h $TempDevelRoot/include/linux/version.h
|
# ln -s ../generated/uapi/linux/version.h $TempDevelRoot/include/linux/version.h
|
||||||
cp -fR scripts $TempDevelRoot
|
cp -fR scripts $TempDevelRoot
|
||||||
cp -fR kernel/bounds.c $TempDevelRoot/kernel
|
cp -fR kernel/bounds.c $TempDevelRoot/kernel
|
||||||
cp -fR tools/include $TempDevelRoot/tools/
|
cp -fR tools/include $TempDevelRoot/tools/
|
||||||
|
@ -1304,8 +1279,8 @@ SaveDevel() {
|
||||||
done
|
done
|
||||||
|
|
||||||
%ifnarch %{arm}
|
%ifnarch %{arm}
|
||||||
rm -rf $TempDevelRoot/arch/arm
|
rm -rf $TempDevelRoot/arch/arm*
|
||||||
rm -rf $TempDevelRoot/arch/arm64
|
rm -rf $TempDevelRoot/include/kvm/arm*
|
||||||
%endif
|
%endif
|
||||||
%ifnarch %{ix86} x86_64
|
%ifnarch %{ix86} x86_64
|
||||||
rm -rf $TempDevelRoot/arch/x86
|
rm -rf $TempDevelRoot/arch/x86
|
||||||
|
@ -1628,6 +1603,10 @@ CreateKernel nrj-desktop
|
||||||
CreateKernel nrj-realtime
|
CreateKernel nrj-realtime
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %build_nrj_server
|
||||||
|
CreateKernel nrj-server
|
||||||
|
%endif
|
||||||
|
|
||||||
%if %build_nrj_laptop
|
%if %build_nrj_laptop
|
||||||
CreateKernel nrj-laptop
|
CreateKernel nrj-laptop
|
||||||
%endif
|
%endif
|
||||||
|
@ -1684,14 +1663,6 @@ CreateKernel nrj-desktop-core2-pae
|
||||||
%endif
|
%endif
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%if %build_nrj_server_lxc
|
|
||||||
CreateKernel nrj-server-lxc
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %build_nrj_server_lxc_exp
|
|
||||||
CreateKernel nrj-server-lxc-exp
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%ifarch %{arm}
|
%ifarch %{arm}
|
||||||
%if %build_iop32x
|
%if %build_iop32x
|
||||||
CreateKernel iop32x
|
CreateKernel iop32x
|
||||||
|
@ -1709,24 +1680,20 @@ LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{rpmrel}/" Makefile
|
||||||
|
|
||||||
|
|
||||||
############################################################
|
############################################################
|
||||||
### Linker start3 > Check point to build for cooker 2013 ###
|
### Linker start3 > Check point to build for omv or rosa ###
|
||||||
############################################################
|
############################################################
|
||||||
# build perf
|
|
||||||
|
|
||||||
%if %{build_perf}
|
%if %{build_perf}
|
||||||
%make -C tools/perf -s HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} all
|
%smake -C tools/perf -s HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} all
|
||||||
%make -C tools/perf -s prefix=%{_prefix} man
|
%smake -C tools/perf -s prefix=%{_prefix} man
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# build cpupower
|
|
||||||
|
|
||||||
%if %{build_cpupower}
|
%if %{build_cpupower}
|
||||||
# make sure version-gen.sh is executable.
|
# make sure version-gen.sh is executable.
|
||||||
chmod +x tools/power/cpupower/utils/version-gen.sh
|
chmod +x tools/power/cpupower/utils/version-gen.sh
|
||||||
%make -C tools/power/cpupower CPUFREQ_BENCH=false
|
%make -C tools/power/cpupower CPUFREQ_BENCH=false
|
||||||
%endif
|
%endif
|
||||||
############################################################
|
############################################################
|
||||||
### Linker end3 > Check point to build for cooker 2013 ###
|
### Linker end3 > Check point to build for omv or rosa ###
|
||||||
############################################################
|
############################################################
|
||||||
|
|
||||||
|
|
||||||
|
@ -1771,6 +1738,9 @@ for i in alpha arc avr32 blackfin c6x cris frv h8300 hexagon ia64 m32r m68k m68k
|
||||||
mips openrisc parisc powerpc s390 score sh sh64 sparc tile unicore32 v850 xtensa mn10300; do
|
mips openrisc parisc powerpc s390 score sh sh64 sparc tile unicore32 v850 xtensa mn10300; do
|
||||||
rm -rf %{target_source}/arch/$i
|
rm -rf %{target_source}/arch/$i
|
||||||
done
|
done
|
||||||
|
%ifnarch %{arm}
|
||||||
|
rm -rf %{target_source}/include/kvm/arm*
|
||||||
|
%endif
|
||||||
|
|
||||||
# other misc files
|
# other misc files
|
||||||
rm -f %{target_source}/{.config.old,.config.cmd,.gitignore,.lst,.mailmap}
|
rm -f %{target_source}/{.config.old,.config.cmd,.gitignore,.lst,.mailmap}
|
||||||
|
@ -1823,7 +1793,7 @@ make -C tools/perf -s V=1 DESTDIR=%{buildroot} HAVE_CPLUS_DEMANGLE=1 prefix=%{_
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
############################################################
|
############################################################
|
||||||
### Linker start4 > Check point to build for cooker 2013 ###
|
### Linker start4 > Check point to build for omv or rosa ###
|
||||||
############################################################
|
############################################################
|
||||||
%if %{build_cpupower}
|
%if %{build_cpupower}
|
||||||
make -C tools/power/cpupower DESTDIR=%{buildroot} libdir=%{_libdir} mandir=%{_mandir} CPUFREQ_BENCH=false install
|
make -C tools/power/cpupower DESTDIR=%{buildroot} libdir=%{_libdir} mandir=%{_mandir} CPUFREQ_BENCH=false install
|
||||||
|
@ -1836,7 +1806,7 @@ install -m644 %{SOURCE50} %{buildroot}%{_unitdir}/cpupower.service
|
||||||
install -m644 %{SOURCE51} %{buildroot}%{_sysconfdir}/sysconfig/cpupower
|
install -m644 %{SOURCE51} %{buildroot}%{_sysconfdir}/sysconfig/cpupower
|
||||||
%endif
|
%endif
|
||||||
############################################################
|
############################################################
|
||||||
### Linker start4 > Check point to build for cooker 2013 ###
|
### Linker start4 > Check point to build for omv or rosa ###
|
||||||
############################################################
|
############################################################
|
||||||
|
|
||||||
###
|
###
|
||||||
|
@ -1931,7 +1901,12 @@ rm -rf %{buildroot}
|
||||||
%if %{build_perf}
|
%if %{build_perf}
|
||||||
%files -n perf
|
%files -n perf
|
||||||
%{_bindir}/perf
|
%{_bindir}/perf
|
||||||
|
%{_bindir}/trace
|
||||||
%dir %{_prefix}/libexec/perf-core
|
%dir %{_prefix}/libexec/perf-core
|
||||||
|
%{_libdir}/libperf-gtk.so
|
||||||
|
%dir %{_libdir}/traceevent
|
||||||
|
%dir %{_libdir}/traceevent/plugins
|
||||||
|
%{_libdir}/traceevent/plugins/*
|
||||||
%{_prefix}/libexec/perf-core/*
|
%{_prefix}/libexec/perf-core/*
|
||||||
%{_mandir}/man[1-8]/perf*
|
%{_mandir}/man[1-8]/perf*
|
||||||
%{_sysconfdir}/bash_completion.d/perf
|
%{_sysconfdir}/bash_completion.d/perf
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
Version: GnuPG v2.0.19 (GNU/Linux)
|
|
||||||
|
|
||||||
iQEcBAABAgAGBQJR0LWKAAoJEHm+PkMAQRiG1VcIAJTZEcZ4x3F7yzLyA+OfsEm6
|
|
||||||
q4PrmLdcqmFOn9vh+kZ/IHvawIa038TGxxfkPC5l8ViDbEgvkIt3V1XfEIKeRxEV
|
|
||||||
9uKwRuJH4wXiB8sJ/+4uOszJ0hM3aJajFftbgQ3vxA7/Ve3vG/OMWeOSfe+k66Hu
|
|
||||||
KKeNNorTqMBseUt3cG5kLYliotxe7PTCs+uM1EtKHodUBr8GBVNFpDBhbjiLVr2H
|
|
||||||
iPzulOVZKmk2GwjnKHTtAJADCRL/DW0RLtSMcjqLcd9ovKssBR5BO/G0/N/+VMNO
|
|
||||||
9Xt3q2hat7qo3AzeR//2DC5cZlIVY5tQSqqdrTMCBLGeZTnvciwWKCyElcc7t3s=
|
|
||||||
=Cmwg
|
|
||||||
-----END PGP SIGNATURE-----
|
|
11
linux-3.14.tar.sign
Normal file
11
linux-3.14.tar.sign
Normal file
|
@ -0,0 +1,11 @@
|
||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
Version: GnuPG v1
|
||||||
|
|
||||||
|
iQEcBAABAgAGBQJTOOUkAAoJEHm+PkMAQRiGRzUH/RTLPnnpw/jo13GAXnAAwesO
|
||||||
|
k8Bb1YnkLLkRoOU5tIatQxUn6uDEtkZMcAA4GbTin58gIzBlfrdDOtrOnWoerKaJ
|
||||||
|
2Gbltrf4B6Y/nQWFPAJR6CQLNc/0cl4Djh8sUQ/wDt2XzpExbIUg2nOmq/Bk8v5t
|
||||||
|
wW9YFAhS0kar3bhTCKk1fyNf4uHxBTzNMnTAumZjMqoKjXo58uxwqwp5SrAOrcJU
|
||||||
|
a1M7rqUo2ZPrKj453LM296naGBInM3/yGQhFBJCmhIPTLg+ekrXDIQREZkPsb8R8
|
||||||
|
NeLSzyHbGqf6x0bhyUi4gunQRcTXMIUI5p6NzsPGnJep95hfrZal5lNnHeZzqeM=
|
||||||
|
=xfKd
|
||||||
|
-----END PGP SIGNATURE-----
|
|
@ -1,17 +0,0 @@
|
||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
Version: GnuPG v2
|
|
||||||
|
|
||||||
iQIcBAABAgAGBQJTsiaaAAoJEDjbvchgkmk+RQAP/jfJFgWwbVNuKNT4zHB+sDPp
|
|
||||||
yV1RYC/qHJA9ppMbhzU2nVY360D4GGIt3SLzMguLYns9XLV3PYRuUUucJF1NmXjO
|
|
||||||
JCDaESozi/y2cUvpjyHP8bGt+R/VyBeeKy+yndd5FCdsoIQHjONFcZ2QYLAomMlI
|
|
||||||
+i3/EzCBhTLsFStRNUGr/wQkkdKH+jqauS3bsA2XIL9eYhuk/MNs4ZF6PDnhpqr1
|
|
||||||
NFjyHB/WLIaFnQRdcPYAdre45RJgCaDLhHj7DGIA7nQf3sFYp3/EwoqJ/zpJ7iil
|
|
||||||
nNhGdISAC/8SvJL4Zk96ucEvnnviT/97yT4fk1BQflaEsmAcPxFRwIDFcIaCTeNU
|
|
||||||
Li5snpAKXYaCI6RPgjDb9eaDjrPz6+6sh7aQfKNNcW0L1IOdSVhtd47F57cG2XAT
|
|
||||||
ctb1Bwl3As3p0WsF7XNvWPzUkpQCAI8hJ4ugqX7xhHxubKuNiWpj5HEDXwM9dBOt
|
|
||||||
R9mKbr8D2xCX9O7lS+N1xP30I1RN/qOOdOhOvq2fyj1lyLOMM5sefQnnUySyyn47
|
|
||||||
UtMZU6BwRTpe2i7+Op8yXKoxr40OsVQ1fTCcvBmCRqWItk1t98GskMXxXrsKi8Na
|
|
||||||
hT9yrrbw051Lj+XUAmKbfPBEfFBIbP7CCQfdSKTpn/ViB+leocKVHKL5GtUaG9Gx
|
|
||||||
C5Q5ObxKcCb2s+qVGWrw
|
|
||||||
=+w8b
|
|
||||||
-----END PGP SIGNATURE-----
|
|
17
patch-3.14.10.sign
Normal file
17
patch-3.14.10.sign
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
Version: GnuPG v2
|
||||||
|
|
||||||
|
iQIcBAABAgAGBQJTsicZAAoJEDjbvchgkmk+Z48P/R+jfZIdENsDCF6a+Agb8CUW
|
||||||
|
/CDes3LxtW63fMFHPPhZ0DNPKWk9V0Cfvy9Ur9KfS2TvcDHlBjiD5dMB2/SFeN7A
|
||||||
|
81CPTno3/7eKBo0mM1c5c0A8ikufgFgS7H/QvDUlLBz7gfV+EGdDsjRZKskwPbC9
|
||||||
|
EkG36J7l+bWEJAtNdgDzwm2BQayITKTzOQhjpAp0pX16M1uch6V8YKsmLUTt3veu
|
||||||
|
udjFC0Jyq7arSJ/5UkzMqQgZtiEYmhf9omYg9+5QPb2wMW5iY+5/W8M/rGUQdSlG
|
||||||
|
MxxTAKencjcq3O74LOU7zyZ2EhUK3qBs5ZmfmSv5MmDYoxTCyr+rznlCn/BeTCJN
|
||||||
|
Ftl20O/ONFUTtKAq7g6bW+/K3C6tg1r+vLRWZX79otmg6Co7I45DPXyVn3kaSwYY
|
||||||
|
9P1s7cgN+dUwCv+SQqF4Thn/EcLtnoIB3G0DpRRKal5qtn9NIObrP7J/eaxD0Vdz
|
||||||
|
NHe9k9FjCgIeX9/u2cjKc4fnsdbWtvV8zQ6XTWGOF0GHhU9ijY7l9EdLBGYEctIO
|
||||||
|
iWPcQTNuiFFQsmK3JGKIhRc1NRhn+aXMvpaG9C0mY6z2v+xMa4PQf/VAWuNYWmkA
|
||||||
|
QJluSY/eXuv0YFLbznaXfss9vXi3N+0fuA/3yRN+J0cxfBOVq02RmBMUOoi/6bv5
|
||||||
|
CMtNwa3c8XmFeluhfqza
|
||||||
|
=LWvB
|
||||||
|
-----END PGP SIGNATURE-----
|
Loading…
Add table
Reference in a new issue