From b074d0085b5a7ac7836c887e72f89730af1afd5d Mon Sep 17 00:00:00 2001 From: Tobias Powalowski Date: Sat, 23 Jun 2012 10:26:19 +0000 Subject: [PATCH] bump to latest version --- 3.4.2-rpc_pipefs.patch | 33 --------------------------------- PKGBUILD | 12 ++++-------- linux.install | 2 +- 3 files changed, 5 insertions(+), 42 deletions(-) delete mode 100644 3.4.2-rpc_pipefs.patch diff --git a/3.4.2-rpc_pipefs.patch b/3.4.2-rpc_pipefs.patch deleted file mode 100644 index db53b38..0000000 --- a/3.4.2-rpc_pipefs.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/net/sunrpc/rpc_pipe.c b/net/sunrpc/rpc_pipe.c -index 0404047..21fde99 100644 ---- a/net/sunrpc/rpc_pipe.c -+++ b/net/sunrpc/rpc_pipe.c -@@ -71,7 +71,9 @@ static void rpc_purge_list(wait_queue_head_t *waitq, struct list_head *head, - msg->errno = err; - destroy_msg(msg); - } while (!list_empty(head)); -- wake_up(waitq); -+ -+ if (waitq) -+ wake_up(waitq); - } - - static void -@@ -91,11 +93,9 @@ rpc_timeout_upcall_queue(struct work_struct *work) - } - dentry = dget(pipe->dentry); - spin_unlock(&pipe->lock); -- if (dentry) { -- rpc_purge_list(&RPC_I(dentry->d_inode)->waitq, -- &free_list, destroy_msg, -ETIMEDOUT); -- dput(dentry); -- } -+ rpc_purge_list(dentry ? &RPC_I(dentry->d_inode)->waitq : NULL, -+ &free_list, destroy_msg, -ETIMEDOUT); -+ dput(dentry); - } - - ssize_t rpc_pipe_generic_upcall(struct file *filp, struct rpc_pipe_msg *msg, --- -1.7.7.6 - diff --git a/PKGBUILD b/PKGBUILD index b01f932..b5b1c85 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,7 +7,7 @@ pkgname=('linux' 'linux-headers' 'linux-docs') # Build stock -ARCH kernel # pkgname=linux-custom # Build kernel with a different name _kernelname=${pkgname#linux} _basekernel=3.4 -pkgver=${_basekernel}.3 +pkgver=${_basekernel}.4 pkgrel=1 arch=('i686' 'x86_64') url="http://www.kernel.org/" @@ -22,17 +22,15 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.4.tar.xz" "${pkgname}.preset" 'fix-acerhdf-1810T-bios.patch' 'change-default-console-loglevel.patch' - 'i915-fix-ghost-tv-output.patch' - '3.4.2-rpc_pipefs.patch') + 'i915-fix-ghost-tv-output.patch') md5sums=('967f72983655e2479f951195953e8480' - '3b6cf4f6337346ee78904eb70e2d4e08' + '58e6672d932d74d5e2b6811b9d37d67c' '3f2c307c8ffae67f60c13ef69af8364a' '18d9d09152bafffaef78f2aac07e7145' 'eb14dcfd80c00852ef81ded6e826826a' '38c1fd4a1f303f1f6c38e7f082727e2f' '9d3c56a4b999c8bfbd4018089a62f662' - '263725f20c0b9eb9c353040792d644e5' - '5a7baeab35f968bf9a6ab115d14586c7') + '263725f20c0b9eb9c353040792d644e5') build() { cd "${srcdir}/linux-${_basekernel}" @@ -40,8 +38,6 @@ build() { # add upstream patch patch -p1 -i "${srcdir}/patch-${pkgver}" - # fix nfs4 regression - patch -Np1 -i "${srcdir}/3.4.2-rpc_pipefs.patch" # add latest fixes from stable queue, if needed # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git diff --git a/linux.install b/linux.install index 88dc65d..0aa038f 100644 --- a/linux.install +++ b/linux.install @@ -2,7 +2,7 @@ # arg 2: the old package version KERNEL_NAME= -KERNEL_VERSION=3.4.3-1-ARCH +KERNEL_VERSION=3.4.4-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'