From 2ce4d476bad51c8cb4087d92ee44c6db2b22feb6 Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Tue, 18 Dec 2012 13:17:47 +0000 Subject: [PATCH] bump to latest version, added nfs41 support --- PKGBUILD | 17 ++++++----------- config | 10 +++++++--- config.x86_64 | 10 +++++++--- linux.install | 2 +- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 6f3e5fc..ee9ec0b 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgbase=linux # Build stock -ARCH kernel #pkgbase=linux-custom # Build kernel with a different name _srcname=linux-3.7 -pkgver=3.7 +pkgver=3.7.1 pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" @@ -13,7 +13,7 @@ license=('GPL2') makedepends=('xmlto' 'docbook-xsl') options=('!strip') source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz" - #"http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz" + "http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz" # the main kernel config files 'config' 'config.x86_64' # standard config files for mkinitcpio ramdisk @@ -21,8 +21,9 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz" 'change-default-console-loglevel.patch' 'fat-3.6.x.patch') md5sums=('21223369d682bcf44bcdfe1521095983' - '94910add7f2687dc6fc8d48364e0bba4' - '2dd29b36cbb013eca263427e9c391fcd' + '48f5f530b048e387e978e3e49de7742a' + '2cf43e0448a8074eb2ff93035168250b' + '58a9ba178fedb244a0a86b760fb4bd81' 'eb14dcfd80c00852ef81ded6e826826a' '9d3c56a4b999c8bfbd4018089a62f662' '88d501404f172dac6fcb248978251560') @@ -33,7 +34,7 @@ build() { cd "${srcdir}/${_srcname}" # add upstream patch - #patch -p1 -i "${srcdir}/patch-${pkgver}" + patch -p1 -i "${srcdir}/patch-${pkgver}" # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git @@ -321,9 +322,3 @@ for _p in ${pkgname[@]}; do done # vim:set ts=8 sts=2 sw=2 et: -md5sums=('21223369d682bcf44bcdfe1521095983' - '94910add7f2687dc6fc8d48364e0bba4' - '2dd29b36cbb013eca263427e9c391fcd' - 'eb14dcfd80c00852ef81ded6e826826a' - '9d3c56a4b999c8bfbd4018089a62f662' - '88d501404f172dac6fcb248978251560') diff --git a/config b/config index eb9edc7..5a4341f 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/i386 3.7.0-rc7 Kernel Configuration +# Linux/i386 3.7.1-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -4563,7 +4563,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m CONFIG_USB_STORAGE_KARMA=m CONFIG_USB_STORAGE_CYPRESS_ATACB=m CONFIG_USB_STORAGE_ENE_UB6250=m -CONFIG_USB_UAS=m # # USB Imaging devices @@ -5510,7 +5509,11 @@ CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=m # CONFIG_NFS_SWAP is not set -# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_V4_1=y +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_OBJLAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y @@ -5526,6 +5529,7 @@ CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_SUNRPC_DEBUG is not set CONFIG_CEPH_FS=m diff --git a/config.x86_64 b/config.x86_64 index 2a0aaa4..5c65804 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86_64 3.7.0-1 Kernel Configuration +# Linux/x86_64 3.7.1-1 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -4359,7 +4359,6 @@ CONFIG_USB_STORAGE_ONETOUCH=m CONFIG_USB_STORAGE_KARMA=m CONFIG_USB_STORAGE_CYPRESS_ATACB=m CONFIG_USB_STORAGE_ENE_UB6250=m -CONFIG_USB_UAS=m # # USB Imaging devices @@ -5278,7 +5277,11 @@ CONFIG_NFS_V3=m CONFIG_NFS_V3_ACL=y CONFIG_NFS_V4=m # CONFIG_NFS_SWAP is not set -# CONFIG_NFS_V4_1 is not set +CONFIG_NFS_V4_1=y +CONFIG_PNFS_FILE_LAYOUT=m +CONFIG_PNFS_BLOCK=m +CONFIG_PNFS_OBJLAYOUT=m +CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org" CONFIG_NFS_FSCACHE=y # CONFIG_NFS_USE_LEGACY_DNS is not set CONFIG_NFS_USE_KERNEL_DNS=y @@ -5294,6 +5297,7 @@ CONFIG_NFS_ACL_SUPPORT=m CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m +CONFIG_SUNRPC_BACKCHANNEL=y CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_SUNRPC_DEBUG is not set CONFIG_CEPH_FS=m diff --git a/linux.install b/linux.install index 6c40011..6e0892b 100644 --- a/linux.install +++ b/linux.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.7.0-1-ARCH +KERNEL_VERSION=3.7.1-1-ARCH # set a sane PATH to ensure that critical utils like depmod will be found export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'