Merge branch 'HEAD' of ssh://jams@knoppmyth.net/mount/repository/LinHES-PKGBUILD.git

Conflicts:
	abs/core-testing/LinHES-config/PKGBUILD

2 files changed, 27 insertions, 16 deletions

diff --git a/abs/core-testing/aufs/PKGBUILD b/abs/core-testing/aufs/PKGBUILD
index 57b6e24..37ae95f 100644
--- a/abs/core-testing/aufs/PKGBUILD
+++ b/abs/core-testing/aufs/PKGBUILD
@@ -1,34 +1,45 @@
-# $Id: PKGBUILD 5885 2008-07-21 19:28:11Z thomas $
+# $Id: PKGBUILD 15519 2008-10-14 07:05:41Z thomas $
 # Contributor: Paul Mattal <paul@mattal.com>
 # Maintainer: Paul Mattal <pjmattal@elys.com>
 pkgname=aufs
-pkgver=20080527
+pkgver=20081012
 pkgrel=2
-_kernver='2.6.26-ARCH'
+_kernver='2.6.27-ARCH'
 pkgdesc="Another Unionfs Implementation that supports NFS branches"
 arch=('i686' 'x86_64')
 url="http://aufs.sourceforge.net/"
 license=('GPL2')
-depends=('kernel26>=2.6.26-1' 'kernel26<=2.6.27' 'glibc' 'aufs-utils')
+depends=('kernel26>=2.6.27' 'kernel26<2.6.28' 'glibc' 'aufs-utils=20081012')
 install=$pkgname.install
 source=(ftp://ftp.archlinux.org/other/aufs/$pkgname-$pkgver.tar.gz)
 options=(!libtool !makeflags)
-md5sums=('4378221aa5763d1f4408a0bbb0e80f0a')
+md5sums=('fb5eaa69b2c7e6e521cb9a9cae9ac23f')
 
 build() {
   cd $startdir/src/$pkgname || return 1
 
-  # use splice functions exported by unionfs kernel patch
-  # - important for loopback fs mounts
-  sed s'|#if.*KERNEL_VERSION(2, 6, 26).*|#if 0|' -i fs/aufs25/vfsub.h \
-    || return 1
+  # 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
+     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
 
-  # patch for spin_lock conflict with the new unionfs patch
-  sed s'|#if.*KERNEL_VERSION(2, 6, 26).*|#if 0|' -i fs/aufs25/cpup.c \
-    || 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
 
diff --git a/abs/core-testing/aufs/aufs.install b/abs/core-testing/aufs/aufs.install
index 42d039a..1a303d6 100644
--- a/abs/core-testing/aufs/aufs.install
+++ b/abs/core-testing/aufs/aufs.install
@@ -5,7 +5,7 @@ pre_install() {
 post_install() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.26-ARCH
+  KERNEL_VERSION=2.6.27-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
   /bin/true
 }
@@ -13,7 +13,7 @@ post_install() {
 post_upgrade() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.26-ARCH
+  KERNEL_VERSION=2.6.27-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
   /bin/true
 }
@@ -21,7 +21,7 @@ post_upgrade() {
 post_remove() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.26-ARCH
+  KERNEL_VERSION=2.6.27-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
   /bin/true
 }