--- cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec 2011/10/25 10:13:58 158005 +++ cauldron/kernel-tmb/current/SPECS/kernel-tmb.spec 2011/11/27 23:05:48 173213 @@ -2,9 +2,9 @@ # *tmb* series kernels now use kernel.org versioning # %define kernelversion 3 -%define patchlevel 0 +%define patchlevel 1 # sublevel is now used for -stable patches -%define sublevel 8 +%define sublevel 3 # Package release %define mgarel 1 @@ -158,8 +158,8 @@ # Sources # ### This is for full SRC RPM -Source0: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/linux-%{tar_ver}.tar.bz2 -Source1: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/linux-%{tar_ver}.tar.bz2.sign +Source0: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/linux-%{tar_ver}.tar.xz +Source1: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/linux-%{tar_ver}.tar.sign ### This is for stripped SRC RPM %if %build_nosrc NoSource: 0 @@ -185,23 +185,23 @@ %if %kpatch %if %sublevel -Patch2: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/stable-review/patch-%{kversion}-%{kpatch}.bz2 -Source11: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/stable-review/patch-%{kversion}-%{kpatch}.bz2.sign +Patch2: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/stable-review/patch-%{kversion}-%{kpatch}.xz +Source11: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/stable-review/patch-%{kversion}-%{kpatch}.sign %else -Patch1: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/testing/patch-%{kernelversion}.%{patchlevel}-%{kpatch}.bz2 -Source10: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/testing/patch-%{kernelversion}.%{patchlevel}-%{kpatch}.bz2.sign +Patch1: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/testing/patch-%{kernelversion}.%{patchlevel}-%{kpatch}.xz +Source10: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/testing/patch-%{kernelversion}.%{patchlevel}-%{kpatch}.sign %endif %endif %if %kgit -Patch2: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/snapshots/patch-%{kernelversion}.%{patchlevel}-%{kpatch}-git%{kgit}.bz2 -Source11: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/snapshots/patch-%{kernelversion}.%{patchlevel}-%{kpatch}-git%{kgit}.bz2.sign +Patch2: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/snapshots/patch-%{kernelversion}.%{patchlevel}-%{kpatch}-git%{kgit}.xz +Source11: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/snapshots/patch-%{kernelversion}.%{patchlevel}-%{kpatch}-git%{kgit}.sign %endif %if %sublevel %if %kpatch %define prev_sublevel %(expr %{sublevel} - 1) %if %prev_sublevel -Patch1: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kernelversion}.%{patchlevel}.%{prev_sublevel}.bz2 -Source10: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kernelversion}.%{patchlevel}.%{prev_sublevel}.bz2.sign +Patch1: ftp://ftp.kernel.org/pub/linux/kernel/v%{kernelversion}.%{patchlevel}/patch-%{kernelversion}.%{patchlevel}.%{prev_sublevel}.xz +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 @@ -675,7 +675,8 @@ cp -fR drivers/acpi/acpica/*.h $TempDevelRoot/drivers/acpi/acpica/ for i in alpha arm arm26 avr32 blackfin cris frv h8300 ia64 microblaze mips m32r m68k \ - m68knommu mn10300 parisc powerpc ppc s390 sh sh64 score sparc tile unicore32 v850 xtensa; do + m68knommu mn10300 openrisc parisc powerpc ppc s390 sh sh64 score sparc tile \ + unicore32 v850 xtensa; do rm -rf $TempDevelRoot/arch/$i done @@ -954,7 +955,8 @@ # 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 ia64 microblaze mips m32r m68k \ - m68knommu mn10300 parisc powerpc ppc s390 sh sh64 score sparc tile v850 xtensa unicore32; do + m68knommu mn10300 openrisc parisc powerpc ppc s390 sh sh64 score sparc tile \ + v850 xtensa unicore32; do rm -rf %{target_source}/arch/$i done @@ -1076,6 +1078,36 @@ %endif %changelog +* Mon Nov 28 2011 Thomas Backlund 3.1.3-1.mga2 +- update to 3.1.3 +- add patches: + * DG01: i915: Fix inconsistent backlight level during disabled + * DG02: drm: fix integer overflow in drm_mode_dirtyfb_ioctl() + * DG03: radeon/kms: fix up gpio i2c mask bits for r4xx for real + * DG04: i915: Ivybridge still has fences + * DG05: i915: Turn on a required 3D clock gating bit on Sandybridge + * DG06: i915: Turn on another required clock gating bit on Sandybridge + * DP01: pci: rework ASPM disable code (brings power usage back down + to 2.6.37 level) + * FX01: don't serialise direct IO reads on page cache checks + (fixes performance regression introduced in 2.6.38) + * FX02: avoid direct I/O write vs buffered I/O race + * FX03: return -EIO when xfs_vn_getattr() failed + * FX04: fix buffer flushing during unmount + * FX05: fix possible memory corruption in xfs_readlink + * FX06: use doalloc flag in xfs_qm_dqattach_one() +- update patches: + * FU01: unionfs 2.5.10 for 3.1.3 + * MB02: merge 3rdparty support + * MB10-MB12: ndiswrapper 1.57-rc1 +- drop patches: + * DS15: its replaced by SND_HDA_PREALLOC_SIZE config option + * MB13-MB17: ndiswrapper fixes, merged +- disable patches: + * KP01: TuxOnIce support, currently broken +- dont ship openrisc arch files +- update defconfigs + * Tue Oct 25 2011 Thomas Backlund 3.0.8-1.mga2 - update to 3.0.8 * drop merged patch: DM20