Date: Sunday, April 24, 2011 @ 10:38:05 Author: andyrtr Revision: 120494
upgpkg: kernel26-lts 2.6.32.39-1 update to 2.6.32.39; add a gcc46 buildfix Added: kernel26-lts/trunk/buildfix-gcc46.diff Modified: kernel26-lts/trunk/PKGBUILD ---------------------+ PKGBUILD | 15 ++++++++++----- buildfix-gcc46.diff | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-04-24 13:20:36 UTC (rev 120493) +++ PKGBUILD 2011-04-24 14:38:05 UTC (rev 120494) @@ -5,8 +5,8 @@ pkgname=('kernel26-lts' 'kernel26-lts-headers') # Build stock -lts kernel _kernelname=${pkgname#kernel26} _basekernel=2.6.32 -pkgver=${_basekernel}.38 -pkgrel=2 +pkgver=${_basekernel}.39 +pkgrel=1 arch=('i686' 'x86_64') license=('GPL2') url="http://www.kernel.org" @@ -16,14 +16,16 @@ # the main kernel config files config config.x86_64 # standard config files for mkinitcpio ramdisk - ${pkgname}.preset) + ${pkgname}.preset + buildfix-gcc46.diff) options=(!strip) md5sums=('260551284ac224c3a43c4adac7df4879' - '91c3e7a802b95bd2f400748acc91d5b3' + '6cd1e135751b51946f56a2fb49ed05a3' '30851deee235a7486bd408cbe8eb2d71' '3298f542840c52a8b8abc1b3795e455b' 'cd1a62e81eb9e910779f3eb18a6e28c6' - '2cbfeb3e2a18d45f82f613e97fc23355') + '2cbfeb3e2a18d45f82f613e97fc23355' + 'bb7410d7b740dfad0385a07b66e6621f') build() { cd ${srcdir}/linux-$_basekernel @@ -35,6 +37,9 @@ # fix 22343 udev crashes patch -Np1 -i ${srcdir}/libata-alignment.patch + # fix build with gcc46 - http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.38.y.git;a=commitdiff;h=b1d670f1#patch1 + patch -Np1 -i ${srcdir}/buildfix-gcc46.diff + if [ "$CARCH" = "x86_64" ]; then cat ../config.x86_64 >./.config else Added: buildfix-gcc46.diff =================================================================== --- buildfix-gcc46.diff (rev 0) +++ buildfix-gcc46.diff 2011-04-24 14:38:05 UTC (rev 120494) @@ -0,0 +1,32 @@ +From b1d670f10e8078485884f0cf7e384d890909aeaa Mon Sep 17 00:00:00 2001 +From: Greg Rose <gregory.v.r...@intel.com> +Date: Tue, 16 Nov 2010 19:41:36 -0800 +Subject: [PATCH] Remove extra struct page member from the buffer info + structure + +declaration. + +Reported-by: Andi Kleen <a...@firstfloor.org> +Signed-off-by: Greg Rose <gregory.v.r...@intel.com> +Tested-by: Emil Tantilov <emil.s.tanti...@intel.com> +Signed-off-by: Jeff Kirsher <jeffrey.t.kirs...@intel.com> +--- + drivers/net/igbvf/igbvf.h | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/igbvf/igbvf.h +index 63284e3..9d4d63e 100644 +--- a/drivers/net/igbvf/igbvf.h ++++ b/drivers/net/igbvf/igbvf.h +@@ -126,7 +126,6 @@ struct igbvf_buffer { + unsigned int page_offset; + }; + }; +- struct page *page; + }; + + union igbvf_desc { +-- +1.7.4.5 + +