--- cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec 2013/01/17 21:30:27 389214 +++ cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec 2013/04/07 19:46:34 408960 @@ -2,12 +2,12 @@ # *tmb* series kernels now use kernel.org versioning # %define kernelversion 3 -%define patchlevel 6 +%define patchlevel 8 # sublevel is now used for -stable patches -%define sublevel 5 +%define sublevel 6 # Package release -%define mgarel 3 +%define mgarel 1 # kernel Makefile extraversion is substituted by # kpatch/kgit wich are either 0 (empty), rc (kpatch), git (kgit) @@ -654,18 +654,18 @@ cp -fR drivers/lguest/lg.h $TempDevelRoot/drivers/lguest/ # Needed for lirc_gpio (Anssi Hannula, #39004, #54907) - cp -fR drivers/media/video/bt8xx/bttv{,p}.h $TempDevelRoot/drivers/media/video/bt8xx/ - cp -fR drivers/media/video/bt8xx/bt848.h $TempDevelRoot/drivers/media/video/bt8xx/ - cp -fR drivers/media/video/btcx-risc.h $TempDevelRoot/drivers/media/video/ + cp -fR drivers/media/pci/bt8xx/bttv{,p}.h $TempDevelRoot/drivers/media/video/bt8xx/ + cp -fR drivers/media/pci/bt8xx/bt848.h $TempDevelRoot/drivers/media/video/bt8xx/ + cp -fR drivers/media/i2c/btcx-risc.h $TempDevelRoot/drivers/media/video/ # Needed for external dvb tree (#41418) - cp -fR drivers/media/dvb/dvb-core/*.h $TempDevelRoot/drivers/media/dvb/dvb-core/ - cp -fR drivers/media/dvb/frontends/lgdt330x.h $TempDevelRoot/drivers/media/dvb/frontends/ + cp -fR drivers/media/dvb-core/*.h $TempDevelRoot/drivers/media/dvb/dvb-core/ + cp -fR drivers/media/frontends/lgdt330x.h $TempDevelRoot/drivers/media/dvb/frontends/ # 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 c6x cris frv h8300 hexagon ia64 \ + for i in alpha arm arm26 arm64 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 @@ -712,6 +712,7 @@ $DevelRoot/include/Kbuild $DevelRoot/include/acpi $DevelRoot/include/asm-generic +$DevelRoot/include/clocksource $DevelRoot/include/config $DevelRoot/include/crypto $DevelRoot/include/drm @@ -722,7 +723,6 @@ $DevelRoot/include/media $DevelRoot/include/memory $DevelRoot/include/misc -$DevelRoot/include/mtd $DevelRoot/include/net $DevelRoot/include/pcmcia $DevelRoot/include/ras @@ -732,6 +732,7 @@ $DevelRoot/include/sound $DevelRoot/include/target $DevelRoot/include/trace +$DevelRoot/include/uapi $DevelRoot/include/video $DevelRoot/include/xen $DevelRoot/init @@ -952,7 +953,7 @@ # we remove all the source files that we don't ship # first architecture files -for i in alpha arm arm26 avr32 blackfin c6x cris frv h8300 hexagon ia64 \ +for i in alpha arm arm26 arm64avr32 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 @@ -969,21 +970,35 @@ #endif %build_source %endif +# compressing modules +%if %{build_modxz} +find %{target_modules} -name "*.ko" | %kxargs xz -6e +%else +find %{target_modules} -name "*.ko" | %kxargs gzip -9 +%endif + # We used to have a copy of PrepareKernel here # Now, we make sure that the thing in the linux dir is what we want it to be for i in %{target_modules}/*; do - rm -f $i/build $i/source + rm -f $i/build $i/source done -# Create modules.description +# sniff, if we compressed all the modules, we change the stamp :( +# we really need the depmod -ae here pushd %{target_modules} for i in *; do - pushd $i - echo "Creating modules.description for $i" - modules=`find . -name "*.ko.gz"` - echo $modules | %kxargs /sbin/modinfo \ - | perl -lne 'print "$name\t$1" if $name && /^description:\s*(.*)/; $name = $1 if m!^filename:\s*(.*)\.k?o!; $name =~ s!.*/!!' > modules.description - popd + /sbin/depmod -ae -b %{buildroot} -F %{target_boot}/System.map-$i $i + echo $? +done + +# create modules.description +for i in *; do + pushd $i + echo "Creating modules.description for $i" + modules=`find . -name "*.ko.[g,x]z"` + echo $modules | %kxargs /sbin/modinfo \ + | perl -lne 'print "$name\t$1" if $name && /^description:\s*(.*)/; $name = $1 if m!^filename:\s*(.*)\.k?o!; $name =~ s!.*/!!' > modules.description + popd done popd @@ -1016,6 +1031,7 @@ %{_kerneldir}/include/Kbuild %{_kerneldir}/include/acpi %{_kerneldir}/include/asm-generic +%{_kerneldir}/include/clocksource %{_kerneldir}/include/crypto %{_kerneldir}/include/drm %{_kerneldir}/include/keys @@ -1024,7 +1040,6 @@ %{_kerneldir}/include/media %{_kerneldir}/include/memory %{_kerneldir}/include/misc -%{_kerneldir}/include/mtd %{_kerneldir}/include/net %{_kerneldir}/include/pcmcia %{_kerneldir}/include/ras @@ -1034,6 +1049,7 @@ %{_kerneldir}/include/sound %{_kerneldir}/include/target %{_kerneldir}/include/trace +%{_kerneldir}/include/uapi %{_kerneldir}/include/video %{_kerneldir}/include/xen %{_kerneldir}/init @@ -1069,6 +1085,36 @@ %endif %changelog +* Sun Apr 7 2013 Thomas Backlund 3.8.6-1.mga3 +- update to 3.8.6 +- update patches: + * CK01: -ck patchset inclunding BFS 0.428 + * DN01-DN02: alx ethernet driver + * F01-F13: overlayfs + * KP01: TuxOnIce 3.3 + * MB10: ndiswrapper 1.58 +- drop merged/obsolete patches: + * AA01-AA16: stable queue fixes for 3.6 series + * CK02: BFS boot fix + * DM50: DVB-S builfix + * DM60: rttrack buildfix + * MB13, MB14: ndiswrapper buildfixes +- add patches: + * AA01-AA20: 3.8 -stable queue fixes + * DI01: Intel Wellsburg PCH i2c support + * DM10: Intel Wellsburg PCH lpc support + * DN03-DN04: alx buildfixes + * DN10: net: asix: init ASIX AX88772B MAC from EEPROM + * DN11: net: asix: handle packets crossing URB boundaries + * DN12: usb/net/asix_devices: Add USBNET HG20F9 ethernet dongle (coling) + * DN13: asix cleanup + * DN14: net: ax88179_178a: add ASIX AX88179_178A USB 3.0/2.0 to gigabit + ethernet adapter support + * DP01: PCI: Remove not needed check in disable aspm link (fixes ath5k) + * DS10: Intel Wellsburg PCH alsa support + * FR01: Reiser4 support +- update defconfigs + * Thu Nov 1 2012 Thomas Backlund 3.6.5-3.mga3 - add patch: * DN01, DN02: alx network driver