--- cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec 2012/03/07 10:46:41 220927 +++ cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec 2012/03/07 11:00:45 220928 @@ -2,16 +2,16 @@ # *tmb* series kernels now use kernel.org versioning # %define kernelversion 3 -%define patchlevel 2 +%define patchlevel 3 # sublevel is now used for -stable patches -%define sublevel 9 +%define sublevel 0 # Package release %define mgarel 1 # kernel Makefile extraversion is substituted by # kpatch/kgit wich are either 0 (empty), rc (kpatch), git (kgit) -%define kpatch 0 +%define kpatch rc6 # kernel.org -gitX patch (only the number after "git") %define kgit 0 @@ -635,6 +635,7 @@ %ifarch %{ix86} x86_64 cp -fR arch/x86/kernel/asm-offsets.{c,s} $TempDevelRoot/arch/x86/kernel/ 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/ %else cp -fR arch/%{_arch}/kernel/asm-offsets.{c,s} $TempDevelRoot/arch/%{_arch}/kernel/ @@ -662,9 +663,9 @@ # add acpica header files, needed for fglrx build cp -fR drivers/acpi/acpica/*.h $TempDevelRoot/drivers/acpi/acpica/ - for i in alpha arm arm26 avr32 blackfin cris frv h8300 hexagon ia64 microblaze mips m32r m68k \ - m68knommu mn10300 openrisc parisc powerpc ppc s390 sh sh64 score sparc tile \ - unicore32 v850 xtensa; do + for i in alpha arm arm26 avr32 blackfin c6x cris frv h8300 hexagon ia64 \ + microblaze mips m32r m68k m68knommu mn10300 openrisc parisc \ + powerpc ppc s390 sh sh64 score sparc tile unicore32 v850 xtensa; do rm -rf $TempDevelRoot/arch/$i done @@ -947,9 +948,9 @@ # we remove all the source files that we don't ship # first architecture files -for i in alpha arm arm26 avr32 blackfin cris frv h8300 hexagon ia64 microblaze mips m32r m68k \ - m68knommu mn10300 openrisc parisc powerpc ppc s390 sh sh64 score sparc tile \ - v850 xtensa unicore32; do +for i in alpha arm arm26 avr32 blackfin c6x cris frv h8300 hexagon ia64 \ + microblaze mips m32r m68k m68knommu mn10300 openrisc parisc \ + powerpc ppc s390 sh sh64 score sparc tile v850 xtensa unicore32; do rm -rf %{target_source}/arch/$i done @@ -1062,6 +1063,19 @@ %endif %changelog +* Wed Mar 7 2012 Thomas Backlund 3.3.0-0.rc6.1.mga2 +- update to 3.3-rc6 +- update patches: + * FU01: unionfs 2.5.11 + * MB10, MB13, MB14: ndiswrapper 1.57 +- rediff patches: + * NI15, NI16: netfilter psd support + * patch disabling mrproper in -devel rpms +- disable patch: + * CK01: -ck1 patchset including BFS sceduler (needs update to 3.3 series) +- update defconfigs +- update filelists + * Thu Mar 1 2012 Thomas Backlund 3.2.9-1.mga2 - update to 3.2.9 - require dracut >= 017-1