From 776554f260afbd3df13c498a6f6d06393c200581 Mon Sep 17 00:00:00 2001 From: Eugene Shatokhin Date: Thu, 23 Jan 2014 11:57:37 +0400 Subject: [PATCH] Fixed: the code to remain in spec should be for mdvver=201210 --- kernel-3.10.27-1.spec | 38 +++++++++++++++++--------------------- 1 file changed, 17 insertions(+), 21 deletions(-) diff --git a/kernel-3.10.27-1.spec b/kernel-3.10.27-1.spec index dde15fe..9982e4c 100644 --- a/kernel-3.10.27-1.spec +++ b/kernel-3.10.27-1.spec @@ -188,7 +188,7 @@ %define build_nrj_server_lxc_exp 0 # -# end of kernel name flavour difinitions +# end of kernel name flavour definitions # @@ -299,24 +299,21 @@ %define build_nosrc 0 %{?_with_nosrc: %global build_nosrc 1} - ############################################################ ### Linker start1 > Check point to build for cooker 2013 ### ############################################################ %if %(if [ -z "$CC" ] ; then echo 0; else echo 1; fi) -%define kmake %make CC="$CC" LD="$LD" LDFLAGS="$LDFLAGS" +%define kmake %make CC="$CC" %else -%define kmake %make LD="$LD" LDFLAGS="$LDFLAGS" +%define kmake %make %endif - # there are places where parallel make don't work -%define smake make LD="$LD" LDFLAGS="$LDFLAGS" +%define smake make ########################################################### ### Linker end1 > Check point to build for cooker 2013 ### ########################################################### - # Parallelize xargs invocations on smp machines %define kxargs xargs %([ -z "$RPM_BUILD_NCPUS" ] \\\ && RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"; \\\ @@ -325,7 +322,6 @@ # Sparc arch wants sparc64 kernels %define target_arch %(echo %{_arch} | sed -e 's/mips.*/mips/' -e 's/arm.*/arm/' -e 's/aarch64/arm64/') - # # SRC RPM description # @@ -416,9 +412,9 @@ processor mode, use the "nosmp" boot parameter. ### Global Requires/Provides -%define requires1 microcode -%define requires2 dracut >= 026 -%define requires3 kmod >= 12 +%define requires1 bootloader-utils >= 1.15-8 +%define requires2 dracut >= 017-16 +%define requires3 kmod >= 7-6 %define requires4 sysfsutils >= 2.1.0-12 %define requires5 kernel-firmware >= 20120219-1 @@ -434,18 +430,18 @@ processor mode, use the "nosmp" boot parameter. # conflict dkms packages that dont support kernel-3.10 # all driver versions must be carefully checked to add -%define kconflicts1 dkms-broadcom-wl < 5.100.82.112-12 -%define kconflicts2 dkms-fglrx < 13.200.5-1 -%define kconflicts3 dkms-nvidia-current < 325.15-1 -%define kconflicts4 dkms-nvidia-long-lived < 319.49-1 -%define kconflicts5 dkms-nvidia304 < 304.108-1 -# nvidia173 does not support this kernel +%define kconflicts1 dkms-broadcom-wl < 5.100.82.112-12 +%define kconflicts2 dkms-fglrx < 13.200.5-1 +%define kconflicts3 dkms-nvidia-current < 325.15-2 +%define kconflicts4 dkms-nvidia-long-lived < 304.108-1 +%define kconflicts5 dkms-nvidia173 < 173.14.37-4 # nvidia96xx does not support this kernel or x11-server-1.13 Autoreqprov: no # might be useful too: Suggests: microcode + BuildRequires: kmod-devel kmod-compat BuildRequires: gcc bc @@ -1703,8 +1699,8 @@ LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{rpmrel}/" Makefile # build perf %if %{build_perf} -%make -C tools/perf -s HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} LDFLAGS="%optflags" all -%make -C tools/perf -s prefix=%{_prefix} LDFLAGS="%optflags" man +%make -C tools/perf -s HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} all +%make -C tools/perf -s prefix=%{_prefix} man %endif # build cpupower @@ -1712,7 +1708,7 @@ LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{rpmrel}/" Makefile %if %{build_cpupower} # make sure version-gen.sh is executable. chmod +x tools/power/cpupower/utils/version-gen.sh -%kmake -C tools/power/cpupower CPUFREQ_BENCH=false LDFLAGS="%optflags" +%make -C tools/power/cpupower CPUFREQ_BENCH=false %endif ############################################################ ### Linker end3 > Check point to build for cooker 2013 ### @@ -1815,7 +1811,7 @@ make -C tools/perf -s V=1 DESTDIR=%{buildroot} HAVE_CPLUS_DEMANGLE=1 prefix=%{_ ### Linker start4 > Check point to build for cooker 2013 ### ############################################################ %if %{build_cpupower} -%make -C tools/power/cpupower DESTDIR=%{buildroot} libdir=%{_libdir} mandir=%{_mandir} CPUFREQ_BENCH=false LDFLAGS="%optflags" install +make -C tools/power/cpupower DESTDIR=%{buildroot} libdir=%{_libdir} mandir=%{_mandir} CPUFREQ_BENCH=false install rm -f %{buildroot}%{_libdir}/*.{a,la} %find_lang cpupower mv cpupower.lang ../