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

[Simo Leone]

    Date: Monday, April 21, 2008 @ 23:05:42
  Author: simo
Revision: 720

update aufs and build against kernel 2.6.25

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

-----------------+
 PKGBUILD        |   18 +++++++++---------
 aufs.install    |    6 +++---
 vfs_splice.diff |   10 +++++-----
 3 files changed, 17 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-04-22 03:05:40 UTC (rev 719)
+++ PKGBUILD	2008-04-22 03:05:42 UTC (rev 720)
@@ -2,20 +2,20 @@
 # Contributor: Paul Mattal <paul at mattal.com>
 # Maintainer: Paul Mattal <pjmattal at elys.com>
 pkgname=aufs
-pkgver=20080210
-pkgrel=3
-_kernver='2.6.24-ARCH'
+pkgver=20080421
+pkgrel=1
+_kernver='2.6.25-ARCH'
 pkgdesc="Another Unionfs Implementation that supports NFS branches"
 arch=('i686' 'x86_64')
 url="http://aufs.sourceforge.net/"
 license=('GPL2')
-depends=('kernel26>=2.6.24.4-1' 'kernel26<=2.6.25-0' 'glibc' 'aufs-utils')
+depends=('kernel26>=2.6.25' 'kernel26<=2.6.26' 'glibc' 'aufs-utils')
 install=$pkgname.install
-source=(ftp://ftp.archlinux.org/other/aufs-new/$pkgname-$pkgver.tar.gz \
+source=(ftp://ftp.archlinux.org/other/aufs/$pkgname-$pkgver.tar.gz \
         vfs_splice.diff)
-md5sums=('b365da56879f24ee6234672921a5f820'
-         '2b9cd549bf5194e853c6a2d4a10856eb')
 options=(!libtool !makeflags)
+md5sums=('e3c68f2357cac5a9ffab3f69bb39f041'
+         'c3a52c86149908f3a44f233d1174fb0a')
 
 build() {
   cd $startdir/src/$pkgname || return 1
@@ -37,8 +37,8 @@
   make KDIR=/usr/src/linux-$_kernver/ -f local.mk || return 1
 
   # install
-  install -D -m644 fs/aufs/aufs.ko \
-    $startdir/pkg/lib/modules/$_kernver/fs/aufs/aufs.ko || return 1
+  install -D -m644 fs/aufs25/aufs.ko \
+    $startdir/pkg/lib/modules/$_kernver/fs/aufs25/aufs.ko || return 1
 
   # tweak the install script for the right kernel version
   sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \

Modified: aufs.install
===================================================================
--- aufs.install	2008-04-22 03:05:40 UTC (rev 719)
+++ aufs.install	2008-04-22 03:05:42 UTC (rev 720)
@@ -5,7 +5,7 @@
 post_install() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
-  KERNEL_VERSION=2.6.24-ARCH
+  KERNEL_VERSION=2.6.25-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.24-ARCH
+  KERNEL_VERSION=2.6.25-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.24-ARCH
+  KERNEL_VERSION=2.6.25-ARCH
   depmod -v $KERNEL_VERSION > /dev/null 2>&1
   /bin/true
 }

Modified: vfs_splice.diff
===================================================================
--- vfs_splice.diff	2008-04-22 03:05:40 UTC (rev 719)
+++ vfs_splice.diff	2008-04-22 03:05:42 UTC (rev 720)
@@ -1,10 +1,10 @@
 This patch enables aufs to use the splice functions exported by the
 unionfs kernel patch.
 
-diff -Nru aufs/fs/aufs/vfsub.h aufs.new/fs/aufs/vfsub.h
---- aufs/fs/aufs/vfsub.h	2008-02-03 22:22:46.000000000 -0600
-+++ aufs/fs/aufs/vfsub.h	2008-03-26 20:51:04.000000000 -0500
-@@ -604,7 +604,7 @@
+diff -Nru aufs.orig/fs/aufs25/vfsub.c aufs/fs/aufs25/vfsub.c
+--- aufs.orig/fs/aufs25/vfsub.c	2008-04-19 19:50:40.000000000 -0500
++++ aufs/fs/aufs25/vfsub.c	2008-04-19 19:51:24.000000000 -0500
+@@ -272,7 +272,7 @@
  		  AuDLNPair(in->f_dentry), *ppos, (unsigned long)len, flags);
  
  	lockdep_off();
@@ -13,7 +13,7 @@
  	lockdep_on();
  	if (err >= 0)
  		au_update_fuse_h_inode(in->f_vfsmnt, in->f_dentry); /*ignore*/
-@@ -621,7 +621,7 @@
+@@ -288,7 +288,7 @@
  		  AuDLNPair(out->f_dentry), *ppos, (unsigned long)len, flags);
  
  	lockdep_off();