[arch-commits] Commit in aufs/trunk (PKGBUILD aufs.install)

[Thomas Baechler]

    Date: Sunday, October 12, 2008 @ 07:58:21
  Author: thomas
Revision: 15031

upgpkg: aufs 20081012-1

Modified:
  aufs/trunk/PKGBUILD
  aufs/trunk/aufs.install

--------------+
 PKGBUILD     |   23 ++++++++---------------
 aufs.install |    6 +++---
 2 files changed, 11 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-10-12 11:54:03 UTC (rev 15030)
+++ PKGBUILD	2008-10-12 11:58:21 UTC (rev 15031)
@@ -2,33 +2,26 @@
 # Contributor: Paul Mattal <paul at mattal.com>
 # Maintainer: Paul Mattal <pjmattal at elys.com>
 pkgname=aufs
-pkgver=20080527
-pkgrel=2
-_kernver='2.6.26-ARCH'
+pkgver=20081012
+pkgrel=1
+_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
-  sed -i 's|CONFIG_AUFS_SPLICE_PATCH =|CONFIG_AUFS_SPLICE_PATCH = y|' \
-    local.mk || return 1
+  # Fix TMPFS_MAGIC error
+  sed 's|-le 26|-le 27|g' -i fs/aufs25/Makefile || 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_SHWH =.*|CONFIG_AUFS_SHWH = y|' \
     local.mk || return 1
 

Modified: aufs.install
===================================================================
--- aufs.install	2008-10-12 11:54:03 UTC (rev 15030)
+++ aufs.install	2008-10-12 11:58:21 UTC (rev 15031)
@@ -5,7 +5,7 @@
 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_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_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
 }