summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
Diffstat (limited to 'libre')
-rw-r--r--libre/kernel26-libre-lts/PKGBUILD20
-rw-r--r--libre/kernel26-libre-lts/buildfix-gcc46.diff32
-rw-r--r--libre/kernel26-libre-lts/config17
-rw-r--r--libre/kernel26-libre-lts/config.x86_645
4 files changed, 49 insertions, 25 deletions
diff --git a/libre/kernel26-libre-lts/PKGBUILD b/libre/kernel26-libre-lts/PKGBUILD
index 55cde1f43..f3588dc77 100644
--- a/libre/kernel26-libre-lts/PKGBUILD
+++ b/libre/kernel26-libre-lts/PKGBUILD
@@ -7,30 +7,22 @@ pkgname=('kernel26-libre-lts' 'kernel26-libre-lts-headers') # Build stock -lts k
_kernelname=${pkgname#kernel26-libre}
_basekernel=2.6.32
_preset=kernel26-lts.preset
-pkgver=${_basekernel}.39
+pkgver=${_basekernel}.40
pkgrel=1
arch=('i686' 'x86_64')
license=('GPL2')
url="http://linux-libre.fsfla.org"
source=(http://www.fsfla.org/svnwiki/selibre/linux-libre/download/releases/${pkgver}-libre2/linux-${pkgver}-libre2.tar.bz2
- libata-alignment.patch
# the main kernel config files
config.i686 config.x86_64
# standard config files for mkinitcpio ramdisk
${_preset}
- ${pkgname}.install
- buildfix-gcc46.diff)
+ ${pkgname}.install)
options=(!strip)
build() {
cd ${srcdir}/linux-$pkgver
- # 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
-
cat ../config.$CARCH >./.config
if [ "${_kernelname}" != "" ]; then
sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
@@ -219,10 +211,8 @@ package_kernel26-libre-lts-headers() {
# remove unneeded architectures
rm -rf ${pkgdir}/usr/src/linux-${_kernver}/arch/{alpha,arm,arm26,avr32,blackfin,cris,frv,h8300,ia64,m32r,m68k,m68knommu,mips,microblaze,mn10300,parisc,powerpc,ppc,s390,sh,sh64,sparc,sparc64,um,v850,xtensa}
}
-md5sums=('9502a2248b2024da4f30a5d52a90322d'
- '30851deee235a7486bd408cbe8eb2d71'
+md5sums=('eabd563bea84785dd74f3f694162ca69'
'3298f542840c52a8b8abc1b3795e455b'
- 'cd1a62e81eb9e910779f3eb18a6e28c6'
+ 'f0fcf2ca389e8997a88963d70153a479'
'2cbfeb3e2a18d45f82f613e97fc23355'
- 'fbfc7a1af3208c7b729055d91e1c149a'
- 'bb7410d7b740dfad0385a07b66e6621f')
+ 'fbfc7a1af3208c7b729055d91e1c149a')
diff --git a/libre/kernel26-libre-lts/buildfix-gcc46.diff b/libre/kernel26-libre-lts/buildfix-gcc46.diff
new file mode 100644
index 000000000..595f97d66
--- /dev/null
+++ b/libre/kernel26-libre-lts/buildfix-gcc46.diff
@@ -0,0 +1,32 @@
+From b1d670f10e8078485884f0cf7e384d890909aeaa Mon Sep 17 00:00:00 2001
+From: Greg Rose <gregory.v.rose@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 <andi@firstfloor.org>
+Signed-off-by: Greg Rose <gregory.v.rose@intel.com>
+Tested-by: Emil Tantilov <emil.s.tantilov@intel.com>
+Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@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
+
+
diff --git a/libre/kernel26-libre-lts/config b/libre/kernel26-libre-lts/config
index d2bba6bee..fa7600cfb 100644
--- a/libre/kernel26-libre-lts/config
+++ b/libre/kernel26-libre-lts/config
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32
-# Fri Feb 18 17:22:19 2011
+# Mon Apr 18 12:31:05 2011
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -2308,9 +2308,9 @@ CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
CONFIG_TOUCHSCREEN_TOUCHWIN=m
CONFIG_TOUCHSCREEN_UCB1400=m
CONFIG_TOUCHSCREEN_WM97XX=m
-# CONFIG_TOUCHSCREEN_WM9705 is not set
-# CONFIG_TOUCHSCREEN_WM9712 is not set
-# CONFIG_TOUCHSCREEN_WM9713 is not set
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
CONFIG_TOUCHSCREEN_USB_EGALAX=y
CONFIG_TOUCHSCREEN_USB_PANJIT=y
@@ -2324,10 +2324,10 @@ CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
CONFIG_TOUCHSCREEN_USB_GOTOP=y
CONFIG_TOUCHSCREEN_USB_JASTEC=y
-# CONFIG_TOUCHSCREEN_USB_E2I is not set
+CONFIG_TOUCHSCREEN_USB_E2I=y
CONFIG_TOUCHSCREEN_TOUCHIT213=m
CONFIG_TOUCHSCREEN_TSC2007=m
-# CONFIG_TOUCHSCREEN_PCAP is not set
+CONFIG_TOUCHSCREEN_PCAP=m
CONFIG_INPUT_MISC=y
CONFIG_INPUT_PCSPKR=m
CONFIG_INPUT_APANEL=m
@@ -4457,7 +4457,7 @@ CONFIG_DLM=m
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
-# CONFIG_PRINTK_TIME is not set
+CONFIG_PRINTK_TIME=y
CONFIG_ENABLE_WARN_DEPRECATED=y
# CONFIG_ENABLE_MUST_CHECK is not set
CONFIG_FRAME_WARN=1024
@@ -4567,7 +4567,8 @@ CONFIG_EARLY_PRINTK=y
# CONFIG_DEBUG_STACK_USAGE is not set
# CONFIG_DEBUG_PER_CPU_MAPS is not set
# CONFIG_X86_PTDUMP is not set
-# CONFIG_DEBUG_RODATA is not set
+CONFIG_DEBUG_RODATA=y
+# CONFIG_DEBUG_RODATA_TEST is not set
# CONFIG_DEBUG_NX_TEST is not set
# CONFIG_4KSTACKS is not set
CONFIG_DOUBLEFAULT=y
diff --git a/libre/kernel26-libre-lts/config.x86_64 b/libre/kernel26-libre-lts/config.x86_64
index 30cc5aefa..b0aadff4e 100644
--- a/libre/kernel26-libre-lts/config.x86_64
+++ b/libre/kernel26-libre-lts/config.x86_64
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32
-# Mon Apr 18 14:25:56 2011
+# Tue May 10 08:27:04 2011
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -4378,7 +4378,8 @@ CONFIG_EARLY_PRINTK=y
# CONFIG_DEBUG_STACK_USAGE is not set
# CONFIG_DEBUG_PER_CPU_MAPS is not set
# CONFIG_X86_PTDUMP is not set
-# CONFIG_DEBUG_RODATA is not set
+CONFIG_DEBUG_RODATA=y
+# CONFIG_DEBUG_RODATA_TEST is not set
# CONFIG_DEBUG_NX_TEST is not set
# CONFIG_IOMMU_DEBUG is not set
# CONFIG_IOMMU_STRESS is not set
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 11:45:27 +0000