[arch-commits] Commit in aufs/repos (extra-i686 extra-i686/PKGBUILD)

[Thomas Baechler]

    Date: Tuesday, October 14, 2008 @ 03:05:41
  Author: thomas
Revision: 15519

Merged revisions 15517 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/aufs/trunk

........
  r15517 | thomas | 2008-10-14 09:01:32 +0200 (Di, 14 Okt 2008) | 1 line
  
  upgpkg: aufs 20081012-2
........

Modified:
  aufs/repos/extra-i686/	(properties)
  aufs/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)


Property changes on: aufs/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /aufs/trunk:1-15036
   + /aufs/trunk:1-15518

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-10-14 07:03:17 UTC (rev 15518)
+++ extra-i686/PKGBUILD	2008-10-14 07:05:41 UTC (rev 15519)
@@ -3,7 +3,7 @@
 # Maintainer: Paul Mattal <pjmattal at elys.com>
 pkgname=aufs
 pkgver=20081012
-pkgrel=1
+pkgrel=2
 _kernver='2.6.27-ARCH'
 pkgdesc="Another Unionfs Implementation that supports NFS branches"
 arch=('i686' 'x86_64')
@@ -21,6 +21,24 @@
   # Fix TMPFS_MAGIC error
   sed 's|-le 26|-le 27|g' -i fs/aufs25/Makefile || return 1
 
+  # use splice functions exported by unionfs kernel patch'
+  # - important for loopback fs mounts 
+  sed -i 's|CONFIG_AUFS_SPLICE_PATCH =|CONFIG_AUFS_SPLICE_PATCH = y|' \
+     local.mk || return 1
+
+  # this fixes the unionfs patch from hanging aufs
+  sed -i 's|CONFIG_AUFS_UNIONFS23_PATCH =|CONFIG_AUFS_UNIONFS23_PATCH = y|' \
+     local.mk || return 1
+
+  sed -i 's|CONFIG_AUFS_WORKAROUND_FUSE =|CONFIG_AUFS_WORKAROUND_FUSE = y|' \
+     local.mk || return 1
+
+  sed -i 's|CONFIG_AUFS_BRANCH_MAX_127 = y|CONFIG_AUFS_BRANCH_MAX_127 =|' \
+     local.mk || return 1
+          	        	       	       	   
+  sed -i 's|CONFIG_AUFS_BRANCH_MAX_1023 =|CONFIG_AUFS_BRANCH_MAX_1023 = y|' \
+     local.mk || return 1
+
   # ???
   sed -i 's|.*CONFIG_AUFS_SHWH =.*|CONFIG_AUFS_SHWH = y|' \
     local.mk || return 1