diff --git a/srcpkgs/kernel/common-vars b/srcpkgs/kernel/common-vars index 29a29744a4d..c125815459e 100644 --- a/srcpkgs/kernel/common-vars +++ b/srcpkgs/kernel/common-vars @@ -2,9 +2,9 @@ # build templates. _kernel_ver=2.6.38 #version=${_kernel_ver} -_kernel_patch_ver=4 +_kernel_patch_ver=5 version=${_kernel_ver}.${_kernel_patch_ver} wrksrc="linux-$version" distfiles="${KERNEL_SITE}/kernel/v2.6/linux-$version.tar.bz2" maintainer="Juan RP " -checksum=dad61f6c980209d60d5b891324e9db04b9c80d16b4515d9e7a550388899bc46c +checksum=1eae9aaf22106213e14eb2a9b5962a00156ac0e7eae71fecfae26161a8725034 diff --git a/srcpkgs/kernel/patches/series b/srcpkgs/kernel/patches/series deleted file mode 100644 index 54ef3cb6983..00000000000 --- a/srcpkgs/kernel/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -unionfs-2.5.8_for_2.6.38-rc7.diff.gz -unionfs-2.5.8-setattr-fixes.patch diff --git a/srcpkgs/kernel/patches/unionfs-2.5.8-setattr-fixes.patch b/srcpkgs/kernel/patches/unionfs-2.5.8-setattr-fixes.patch deleted file mode 100644 index af7ff5eb5a2..00000000000 --- a/srcpkgs/kernel/patches/unionfs-2.5.8-setattr-fixes.patch +++ /dev/null @@ -1,25 +0,0 @@ -Adapted for 2.6.38 from http://www.fsl.cs.sunysb.edu/pipermail/unionfs/2011-March/006088.html - ---- fs/unionfs/inode.c.orig 2011-03-29 09:19:23.477166008 +0200 -+++ fs/unionfs/inode.c 2011-03-29 09:22:02.267303281 +0200 -@@ -936,7 +936,8 @@ static int unionfs_setattr(struct dentry - err = -EINVAL; - goto out; - } -- lower_inode = unionfs_lower_inode(inode); -+ lower_inode = lower_dentry->d_inode; -+ BUG_ON(!lower_inode); - - /* check if user has permission to change lower inode */ - err = inode_change_ok(lower_inode, ia); -@@ -970,7 +971,9 @@ static int unionfs_setattr(struct dentry - goto out; - /* get updated lower_dentry/inode after copyup */ - lower_dentry = unionfs_lower_dentry(dentry); -- lower_inode = unionfs_lower_inode(inode); -+ BUG_ON(!lower_inode); -+ lower_inode = lower_dentry->d_inode; -+ BUG_ON(!lower_inode); - } - - /* diff --git a/srcpkgs/kernel/patches/unionfs-2.5.8_for_2.6.38-rc7.diff.gz b/srcpkgs/kernel/patches/unionfs-2.5.8_for_2.6.38-rc7.diff.gz deleted file mode 100644 index 3c0df79c072..00000000000 Binary files a/srcpkgs/kernel/patches/unionfs-2.5.8_for_2.6.38-rc7.diff.gz and /dev/null differ diff --git a/srcpkgs/kernel/patches/unionfs-2.5.9_for_2.6.38.4.diff.gz b/srcpkgs/kernel/patches/unionfs-2.5.9_for_2.6.38.4.diff.gz new file mode 100644 index 00000000000..796caa63105 Binary files /dev/null and b/srcpkgs/kernel/patches/unionfs-2.5.9_for_2.6.38.4.diff.gz differ diff --git a/srcpkgs/kernel/patches/unionfs-2.5.8_for_2.6.38-rc7.diff.gz.args b/srcpkgs/kernel/patches/unionfs-2.5.9_for_2.6.38.4.diff.gz.args similarity index 100% rename from srcpkgs/kernel/patches/unionfs-2.5.8_for_2.6.38-rc7.diff.gz.args rename to srcpkgs/kernel/patches/unionfs-2.5.9_for_2.6.38.4.diff.gz.args