From ac39b4df0a010a357df87ea431bd670184b13c00 Mon Sep 17 00:00:00 2001 From: Eugene Shatokhin Date: Wed, 22 Jan 2014 18:31:57 +0400 Subject: [PATCH] Removed obsolete mdvver stuff --- kernel-3.10.27-1.spec | 116 ++++-------------------------------------- 1 file changed, 11 insertions(+), 105 deletions(-) diff --git a/kernel-3.10.27-1.spec b/kernel-3.10.27-1.spec index 4e9c4d4..05d9c6d 100644 --- a/kernel-3.10.27-1.spec +++ b/kernel-3.10.27-1.spec @@ -1,14 +1,3 @@ -# MIB header - -%if %{mdvver} <= 201100 -%define distsuffix mib -%define disttag %{distsuffix} -Vendor: MIB - Mandriva International Backports -%endif - -Packager: Eugene Shatokhin -# end MIB header - # %define kernelversion 3 %define patchlevel 10 @@ -204,20 +193,11 @@ Packager: Eugene Shatokhin # build perf and cpupower tools -%if %{mdvver} >= 201200 %define build_perf 1 %define build_cpupower 1 -%else -%define build_perf 0 -%define build_cpupower 0 -%endif # compress modules with xz -%if %{mdvver} >= 201200 %define build_modxz 1 -%else -%define build_modxz 0 -%endif # ARM builds %ifarch %{arm} @@ -323,34 +303,28 @@ Packager: Eugene Shatokhin ############################################################ ### Linker start1 > Check point to build for cooker 2013 ### ############################################################ -%if %{mdvver} < 201300 -%if %(if [ -z "$CC" ] ; then echo 0; else echo 1; fi) -%define kmake %make CC="$CC" -%else -%define kmake %make -%endif -# there are places where parallel make don't work -%define smake make -%endif - -%if %{mdvver} == 201300 %if %cross_compiling + %if %(if [ -z "$CC" ] ; then echo 0; else echo 1; fi) %define kmake %make ARCH=%target_arch CROSS_COMPILE=%(echo %__cc |sed -e 's,-gcc,-,') CC="$CC" LD="$LD" LDFLAGS="$LDFLAGS" %else %define kmake %make ARCH=%target_arch CROSS_COMPILE=%(echo %__cc |sed -e 's,-gcc,-,') LD="$LD" LDFLAGS="$LDFLAGS" %endif + # there are places where parallel make don't work %define smake make ARCH=%target_arch CROSS_COMPILE=%(echo %__cc |sed -e 's,-gcc,-,') LD="$LD" LDFLAGS="$LDFLAGS" + %else + %if %(if [ -z "$CC" ] ; then echo 0; else echo 1; fi) %define kmake %make CC="$CC" LD="$LD" LDFLAGS="$LDFLAGS" %else %define kmake %make LD="$LD" LDFLAGS="$LDFLAGS" %endif + # there are places where parallel make don't work %define smake make LD="$LD" LDFLAGS="$LDFLAGS" -%endif + %endif ########################################################### ### Linker end1 > Check point to build for cooker 2013 ### @@ -456,37 +430,11 @@ processor mode, use the "nosmp" boot parameter. ### Global Requires/Provides -%if %{mdvver} == 201300 %define requires1 microcode %define requires2 dracut >= 026 %define requires3 kmod >= 12 %define requires4 sysfsutils >= 2.1.0-12 %define requires5 kernel-firmware >= 20120219-1 -%endif - -%if %{mdvver} == 201210 -%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 -%endif - -%if %{mdvver} == 201200 -%define requires1 bootloader-utils >= 1.15-8 -%define requires2 dracut >= 017-16 -%define requires3 module-init-tools >= 3.16-5 -%define requires4 sysfsutils >= 2.1.0-12 -%define requires5 kernel-firmware >= 20120219-1 -%endif - -%if %{mdvver} < 201200 -%define requires1 bootloader-utils >= 1.13-1 -%define requires2 mkinitrd >= 4.2.17-31 -%define requires3 module-init-tools >= 3.0-7 -%define requires4 sysfsutils >= 1.3.0-1 -%define requires5 kernel-firmware >= 20101024-2 -%endif %define kprovides1 %{kname} = %{kverrel} %define kprovides2 kernel = %{tar_ver} @@ -500,44 +448,19 @@ 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 -# config for all distros apart mdvver 2013.0 & 2012.1 -%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.88-3 -%define kconflicts5 dkms-nvidia173 < 173.14.37-4 -# nvidia96xx does not support this kernel or x11-server-1.13 - -%if %{mdvver} == 201300 -%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 +%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 # nvidia96xx does not support this kernel or x11-server-1.13 -%endif - -%if %{mdvver} == 201210 -%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 -%endif Autoreqprov: no # might be useful too: Suggests: microcode - -%if %{mdvver} >= 201210 BuildRequires: kmod-devel kmod-compat -%else -BuildRequires: module-init-tools -%endif - BuildRequires: gcc bc # for perf, cpufreq and other tools @@ -1133,9 +1056,7 @@ Summary: the cpupower tools Group: System/Kernel and hardware Requires(post): rpm-helper >= 0.24.0-3 Requires(preun): rpm-helper >= 0.24.0-3 -%if %{mdvver} >= 201200 Obsoletes: cpufreq cpufrequtils -%endif %description -n cpupower the cpupower tools. @@ -1245,11 +1166,9 @@ find . -name '*~' -o -name '*.orig' -o -name '*.append' | %kxargs rm -f ############################################################ ### Linker start2 > Check point to build for cooker 2013 ### ############################################################ -%if %{mdvver} == 201300 # Make sure we don't use gold export LD="%{_target_platform}-ld.bfd" export LDFLAGS="--hash-style=sysv --build-id=none" -%endif ############################################################ ### Linker end2 > Check point to build for cooker 2013 ### ############################################################ @@ -1808,26 +1727,17 @@ LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -%{rpmrel}/" Makefile # build perf %if %{build_perf} -%if %{mdvver} < 201300 -%make -C tools/perf -s HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} all -%make -C tools/perf -s prefix=%{_prefix} man -%else %make -C tools/perf -s HAVE_CPLUS_DEMANGLE=1 prefix=%{_prefix} LDFLAGS="%optflags" all %make -C tools/perf -s prefix=%{_prefix} LDFLAGS="%optflags" man %endif -%endif # build cpupower %if %{build_cpupower} # make sure version-gen.sh is executable. chmod +x tools/power/cpupower/utils/version-gen.sh -%if %{mdvver} < 201300 -%make -C tools/power/cpupower CPUFREQ_BENCH=false -%else %kmake -C tools/power/cpupower CPUFREQ_BENCH=false LDFLAGS="%optflags" %endif -%endif ############################################################ ### Linker end3 > Check point to build for cooker 2013 ### ############################################################ @@ -1929,11 +1839,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} -%if %{mdvver} < 201300 -make -C tools/power/cpupower DESTDIR=%{buildroot} libdir=%{_libdir} mandir=%{_mandir} CPUFREQ_BENCH=false install -%else %make -C tools/power/cpupower DESTDIR=%{buildroot} libdir=%{_libdir} mandir=%{_mandir} CPUFREQ_BENCH=false LDFLAGS="%optflags" install -%endif rm -f %{buildroot}%{_libdir}/*.{a,la} %find_lang cpupower mv cpupower.lang ../