--- cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec 2012/06/04 19:38:14 254431 +++ cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec 2012/06/04 19:47:56 254432 @@ -2,12 +2,12 @@ # *tmb* series kernels now use kernel.org versioning # %define kernelversion 3 -%define patchlevel 3 +%define patchlevel 4 # sublevel is now used for -stable patches -%define sublevel 6 +%define sublevel 1 # Package release -%define mgarel 2 +%define mgarel 1 # kernel Makefile extraversion is substituted by # kpatch/kgit wich are either 0 (empty), rc (kpatch), git (kgit) @@ -637,11 +637,13 @@ 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/ %else cp -fR arch/%{_arch}/kernel/asm-offsets.{c,s} $TempDevelRoot/arch/%{_arch}/kernel/ cp -fR arch/%{_arch}/include $TempDevelRoot/arch/%{_arch}/ %endif cp -fR kernel/bounds.c $TempDevelRoot/kernel/ + cp -fR tools/include $TempDevelRoot/tools/ cp -fR .config Module.symvers $TempDevelRoot cp -fR 3rdparty/mkbuild.pl $TempDevelRoot/3rdparty/ @@ -1063,6 +1065,29 @@ %endif %changelog +* Mon Jun 4 2012 Thomas Backlund 3.4.1-1.mga2 +- update to 3.4.1 +- drop merged patches: + * DA60, DA61: ahci/ata ids + * DG01-DG04, DG20-DG21, DG40-DG44, DG60: drm backports + * DN10-DN11: ath5k stablilty fixes + * DS20-DS24: sound fixes +- update patches: + * CK01: ck1 patchset including BFS 0.422 + * FU01: unionfs 2.5.11 + * KP01: tuxonice 3.2.1 + * NI10-NI11: netfilter IFWLOG support + * NI16: netfilter psd support +- add patches: + * DM60: radio-rttrack buildfix + * FU02: unionfs buildfix for kernel-3.4 +- drop patches: + * DA50: prefer ata over ide hack, needs to be fixed properly + * DN20: disabling powersave on rt2800usb + * LK01: lib/Kconfig.debug text update +- update defconfigs +- update filelists + * Thu May 17 2012 Thomas Backlund 3.3.6-2.mga2 - revert switching server kernels to SLAB allocator at it fails to boot with BFS scheduler (reported/confirmed by Charles A Edwards.on -dev ml)