--- cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec 2013/06/28 11:16:08 447891 +++ cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec 2013/08/17 11:34:02 467214 @@ -2,9 +2,11 @@ # *tmb* series kernels now use kernel.org versioning # %define kernelversion 3 -%define patchlevel 9 +%define patchlevel 10 # sublevel is now used for -stable patches -%define sublevel 8 +%define sublevel 7 +# extstable is for extended stable patches +%define extstable 0 # Package release %define mgarel 1 @@ -38,7 +40,11 @@ %define fakerel %mkrel 1 # version defines +%if %extstable +%define kversion %{kernelversion}.%{patchlevel}.%{sublevel}.%{extstable} +%else %define kversion %{kernelversion}.%{patchlevel}.%{sublevel} +%endif %define kverrel %{kversion}-%{rpmrel} # When we are using a pre/rc patch, the tarball is a sublevel -1 @@ -202,9 +208,12 @@ Source10: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kernelversion}.%{patchlevel}.%{prev_sublevel}.sign %endif %else -Patch1: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kversion}.xz -Source10: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kversion}.sign +Patch1: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kernelversion}.%{patchlevel}.%{sublevel}.xz +Source10: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kernelversion}.%{patchlevel}.%{sublevel}.sign +%endif %endif +%if %extstable +Patch3: patch-%{kernelversion}.%{patchlevel}.%{sublevel}.%{extstable}.patch %endif #END @@ -218,12 +227,36 @@ input and output, etc. ### Global Requires/Provides -%define requires1 dracut >= 017-9 -%define requires2 bootloader-utils >= 1.12-1 -%define requires3 sysfsutils >= 1.3.0-1 kmod >= 7-6 -%define requires4 kernel-firmware >= 20111229-1 - -%define kprovides %{kname} = %{kverrel}, kernel = %{tar_ver}, drbd-api = 88 +%define requires1 bootloader-utils >= 1.16-1 +%define requires2 dracut >= 025-8 +%define requires3 kmod >= 12-2 +%define requires4 sysfsutils >= 2.1.0-16 +%define requires5 kernel-firmware >= 20130624-1 + +%define kprovides1 %{kname} = %{kverrel} +%define kprovides2 kernel = %{tar_ver} +%define kprovides3 alsa = 1.0.26 +%define kprovides_server drbd-api = 88 + +# conflict dkms packages that dont support kernel-3.10 +%define kconflicts1 dkms-broadcom-wl < 5.100.82.112-13 +%define kconflicts1 dkms-fglrx < 13.101-0.3 +%define kconflicts2 dkms-nvidia-current < 319.32-2 +%define kconflicts3 dkms-nvidia304 < 304.88-4 +%define kconflicts4 dkms-nvidia173 < 173.14.37-4 +# (tmb) nvidia96xx does not support this kernel or x11-server-1.13 +%define kconflicts5 dkms-nvidia96xx <= 96.43.23 +%define kconflicts6 dmms-xtables-addons < 2.3-1 +# (tmb) conflict too old lvm2 rules to make upgrades work (tv, mga #9536) +%define kconflicts7 lvm2 < 2.02.98-3 +# (tmb) conflict too old drakxtools-backend to avoid bogus root=/dev/ (#9536) +%define kconflicts8 drakxtools-backend < 15.37-1 +# (tmb) conflict older btrfs-progs to get the new in same transaction and in initrd +%define kconflicts9 btrfs-progs < 0.20-0.rc1.20130607.2 +# (tmb) conflict too old plymouth (#10128) +%define kconflicts10 plymouth < 0.8.6.1-8 +# (tmb) conflict too old radeon-firmware to get the uvd firmwares in initrd +%define kconflicts11 radeon-firmware < 20130626-1 Autoreqprov: no BuildRequires: gcc >= 4.0.1-5 kmod >= 7-6 bc @@ -239,14 +272,23 @@ %package -n %{kname}-%{1}-%{buildrel} \ Version: %{fakever} \ Release: %{fakerel} \ -Provides: %kprovides \ -Provides: should-restart = system \ -Requires(pre): %requires1 %requires2 %requires3 %requires4 \ +Summary: %{expand:%{summary_%(echo %{1})}} \ +Group: System/Kernel and hardware \ +Provides: %{kname}-%{1} \ +Provides: %kprovides1 %kprovides2 %kprovides3 \ +%{expand:%%{?kprovides_%{1}:Provides: %{kprovides_%{1}}}} \ +Provides: should-restart = system \ +Requires(pre): %requires1 %requires2 %requires3 %requires4 \ +Requires: %requires2 %requires5 \ +Conflicts: %kconflicts1 %kconflicts2 %kconflicts3 \ +Conflicts: %kconflicts4 %kconflicts5 %kconflicts6 \ +Conflicts: %kconflicts7 %kconflicts8 %kconflicts9 \ +Conflicts: %kconflicts10 %kconflicts11 \ +Suggests: crda iw cpupower \ +Suggests: %{kname}-%{1}-latest \ %ifarch %{ix86} \ Conflicts: arch(x86_64) \ %endif \ -Summary: %{expand:%{summary_%(echo %{1})}} \ -Group: System/Kernel and hardware \ %description -n %{kname}-%{1}-%{buildrel} \ %common_description_kernel %{expand:%{info_%(echo %{1})}} \ \ @@ -254,13 +296,14 @@ %package -n %{kname}-%{1}-devel-%{buildrel} \ Version: %{fakever} \ Release: %{fakerel} \ +Summary: The kernel-devel files for %{kname}-%{1}-%{buildrel} \ +Group: Development/Kernel \ Requires: glibc-devel ncurses-devel make gcc perl \ %ifarch %{ix86} \ Conflicts: arch(x86_64) \ %endif \ -Summary: The kernel-devel files for %{kname}-%{1}-%{buildrel} \ -Group: Development/Kernel \ Provides: kernel-devel = %{kverrel} \ +Suggests: %{kname}-%{1}-devel-latest \ %description -n %{kname}-%{1}-devel-%{buildrel} \ This package contains the kernel-devel files that should be enough to build \ 3rdparty drivers against for use with %{kname}-%{1}-%{buildrel}. \ @@ -544,6 +587,9 @@ %if %kgit %patch2 -p1 %endif +%if %extstable +%patch3 -p1 +%endif %{patches_dir}/scripts/apply_patches @@ -596,7 +642,11 @@ fi # make sure EXTRAVERSION says what we want it to say + %if %extstable + LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = .%{extstable}-$extension/" Makefile + %else LC_ALL=C perl -p -i -e "s/^EXTRAVERSION.*/EXTRAVERSION = -$extension/" Makefile + %endif %smake oldconfig } @@ -640,7 +690,7 @@ cp -fR arch/x86/kernel/asm-offsets_{32,64}.c $TempDevelRoot/arch/x86/kernel/ cp -fR arch/x86/syscalls/syscall* $TempDevelRoot/arch/x86/syscalls/ cp -fR arch/x86/include $TempDevelRoot/arch/x86/ - cp -fR arch/x86/tools/relocs.c $TempDevelRoot/arch/x86/tools/ + cp -fR arch/x86/tools $TempDevelRoot/arch/x86/ %else cp -fR arch/%{_arch}/kernel/asm-offsets.{c,s} $TempDevelRoot/arch/%{_arch}/kernel/ cp -fR arch/%{_arch}/include $TempDevelRoot/arch/%{_arch}/ @@ -719,6 +769,7 @@ $DevelRoot/include/config $DevelRoot/include/crypto $DevelRoot/include/drm +$DevelRoot/include/dt-bindings $DevelRoot/include/generated $DevelRoot/include/keys $DevelRoot/include/linux @@ -1037,6 +1088,7 @@ %{_kerneldir}/include/clocksource %{_kerneldir}/include/crypto %{_kerneldir}/include/drm +%{_kerneldir}/include/dt-bindings %{_kerneldir}/include/keys %{_kerneldir}/include/linux %{_kerneldir}/include/math-emu @@ -1088,6 +1140,26 @@ %endif %changelog +* Sat Aug 17 2013 Thomas Backlund 3.10.7-1.mga4 +- update to 3.10.7 +- drop merged/obsolete patches: + * AA01-AA17: stable queue fixes + * DN01-DN04: alx backport + * DN22: carl9170 fix +- update patches: + * CK01: -ck patchset including BFS 0.440 + * FO01-FO09: overlayfs support + * FR01: Reiser4 support + * KP01: TuxOnIce support +- add patches: + * MB14: ndiswrapper kernel 3.10 buildfix +- add support for extended stable builds +- update requires on firmwares and tools +- add conflicts on too old dkms, firmware and + tools to get better upgrade transactions +- update defconfigs +- update filelists + * Fri Jun 28 2013 Thomas Backlund 3.9.8-1.mga4 - update to 3.9.8 - add patches: