testing/linux-vserver: upgrade to 2.6.31.5. enable highmem64g

2 files changed, 18 insertions, 14 deletions

diff --git a/testing/linux-vserver/APKBUILD b/testing/linux-vserver/APKBUILD
index fac250fe..2f449f68 100644
--- a/testing/linux-vserver/APKBUILD
+++ b/testing/linux-vserver/APKBUILD
@@ -2,7 +2,7 @@
 
 _flavor=vserver
 pkgname=linux-${_flavor}
-pkgver=2.6.31.4
+pkgver=2.6.31.5
 _kernver=2.6.31
 pkgrel=0
 pkgdesc="Linux kernel with vserver"
@@ -13,7 +13,7 @@ _config=${config:-kernelconfig.${CARCH:-x86}}
 install=
 source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
 	ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
-	http://vserver.13thfloor.at/Experimental/patch-2.6.31.4-vs2.3.0.36.19.diff
+	http://vserver.13thfloor.at/Experimental/patch-2.6.31.5-vs2.3.0.36.21.diff
 	kernelconfig.x86
 	"
 subpackages="$pkgname-dev"
@@ -21,7 +21,7 @@ license="GPL-2"
 
 _abi_release=${pkgver}-${_flavor}
 
-_prepare() {
+prepare() {
 	cd "$srcdir"/linux-$_kernver
 	if [ "$_kernver" != "$pkgver" ]; then
 		bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 -N || return 1
@@ -48,10 +48,12 @@ menuconfig() {
 }
 
 build() {
-	_prepare || return 1
 	cd "$srcdir"/build
 	make CC="$CC" || return 1
+}
 
+package() {
+	cd "$srcdir"/build
 	mkdir -p "$pkgdir"/boot "$pkgdir"/lib/modules
 	make modules_install install \
 		INSTALL_MOD_PATH="$pkgdir" \
@@ -112,6 +114,6 @@ dev() {
 }
 
 md5sums="84c077a37684e4cbfa67b18154390d8a  linux-2.6.31.tar.bz2
-02078f4231baee4f0004212f2875df2b  patch-2.6.31.4.bz2
-e42d6fe6420b6e0f980fbf8e0aa29b1c  patch-2.6.31.4-vs2.3.0.36.19.diff
-c9080604a8926fefb2a0ec9ede42f09a  kernelconfig.x86"
+6cac5e59d5562b591cdda485941204d5  patch-2.6.31.5.bz2
+cdb4da685b9d57196de435eb58c39843  patch-2.6.31.5-vs2.3.0.36.21.diff
+f24e62dda29c2562b8e271542d613d20  kernelconfig.x86"
diff --git a/testing/linux-vserver/kernelconfig.x86 b/testing/linux-vserver/kernelconfig.x86
index 0644b5c0..b1ecce42 100644
--- a/testing/linux-vserver/kernelconfig.x86
+++ b/testing/linux-vserver/kernelconfig.x86
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.31.4-vs2.3.0.36.19
-# Fri Oct 16 15:01:25 2009
+# Linux kernel version: 2.6.31.5-vs2.3.0.36.21
+# Mon Oct 26 21:20:26 2009
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -260,6 +260,7 @@ CONFIG_X86_BSWAP=y
 CONFIG_X86_POPAD_OK=y
 CONFIG_X86_ALIGNMENT_16=y
 CONFIG_X86_INTEL_USERCOPY=y
+CONFIG_X86_CMPXCHG64=y
 CONFIG_X86_MINIMUM_CPU_FAMILY=4
 # CONFIG_PROCESSOR_SELECT is not set
 CONFIG_CPU_SUP_INTEL=y
@@ -296,8 +297,8 @@ CONFIG_X86_MSR=m
 CONFIG_X86_CPUID=m
 CONFIG_X86_CPU_DEBUG=m
 # CONFIG_NOHIGHMEM is not set
-CONFIG_HIGHMEM4G=y
-# CONFIG_HIGHMEM64G is not set
+# CONFIG_HIGHMEM4G is not set
+CONFIG_HIGHMEM64G=y
 CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_3G_OPT is not set
 # CONFIG_VMSPLIT_2G is not set
@@ -305,7 +306,8 @@ CONFIG_VMSPLIT_3G=y
 # CONFIG_VMSPLIT_1G is not set
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_HIGHMEM=y
-# CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set
+CONFIG_X86_PAE=y
+CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_ARCH_FLATMEM_ENABLE=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_ARCH_SELECT_MEMORY_MODEL=y
@@ -318,7 +320,7 @@ CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_SPARSEMEM_STATIC=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_SPLIT_PTLOCK_CPUS=4
-# CONFIG_PHYS_ADDR_T_64BIT is not set
+CONFIG_PHYS_ADDR_T_64BIT=y
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_BOUNCE=y
 CONFIG_VIRT_TO_BUS=y
@@ -1587,6 +1589,7 @@ CONFIG_IEEE1394_DV1394=m
 CONFIG_I2O=m
 CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=y
 CONFIG_I2O_EXT_ADAPTEC=y
+CONFIG_I2O_EXT_ADAPTEC_DMA64=y
 CONFIG_I2O_CONFIG=m
 CONFIG_I2O_CONFIG_OLD_IOCTL=y
 CONFIG_I2O_BUS=m
@@ -3817,7 +3820,6 @@ CONFIG_DMA_ENGINE=y
 # DMA Clients
 #
 CONFIG_NET_DMA=y
-# CONFIG_ASYNC_TX_DMA is not set
 CONFIG_DMATEST=m
 CONFIG_DCA=m
 CONFIG_AUXDISPLAY=y