Merge branch 'testing' of knoppmyth.net:linhes_pkgbuild into testing

3 files changed, 22 insertions, 23 deletions

diff --git a/abs/core/aufs2/PKGBUILD b/abs/core/aufs2/PKGBUILD
index 18c2293..a05c666 100644
--- a/abs/core/aufs2/PKGBUILD
+++ b/abs/core/aufs2/PKGBUILD
@@ -1,26 +1,26 @@
-# $Id: PKGBUILD 97484 2010-10-30 17:27:24Z tpowa $
+# $Id: PKGBUILD 105327 2011-01-07 20:08:57Z tpowa $
 # Maintainer: Paul Mattal <pjmattal@elys.com>
 
 pkgname=aufs2
-pkgver=2.6.36_20101021
-pkgrel=2
+pkgver=2.6.37_20110105
+pkgrel=1
 #_kernver=${pkgver%_*}-ARCH
-_kernver=2.6.36-LinHES
+_kernver=2.6.37-LinHES
 pkgdesc="Another Unionfs Implementation"
 arch=('i686' 'x86_64')
 url="http://aufs.sourceforge.net/"
 license=('GPL2')
-depends=('kernel26>=2.6.36' 'kernel26<2.6.37')
-makedepends=('kernel26-headers>=2.6.36' 'kernel26-headers<2.6.37')
+depends=('kernel26>=2.6.37' 'kernel26<2.6.38')
+makedepends=('kernel26-headers>=2.6.37' 'kernel26-headers<2.6.38')
 replaces=('aufs')
 install=${pkgname}.install
-source=("ftp://ftp.archlinux.org/other/aufs2/${pkgname}-${pkgver}.tar.gz"
-       aufs2-module-2.6.36.patch)
+source=("ftp://ftp.archlinux.org/other/aufs2/${pkgname}-${pkgver}.tar.gz")
+       #aufs2-module-2.6.36.patch)
 options=('!makeflags')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Np1 -i ../aufs2-module-2.6.36.patch
+  #patch -Np1 -i ../aufs2-module-2.6.36.patch
   sed -i 's|CONFIG_AUFS_HNOTIFY =.*|CONFIG_AUFS_HNOTIFY = y|' \
      config.mk || return 1
   sed -i 's|CONFIG_AUFS_HFSNOTIFY =.*|CONFIG_AUFS_HFSNOTIFY = y|' \
@@ -41,20 +41,19 @@ build() {
     inot64=""
   fi
   sed -i "s|CONFIG_AUFS_INO_T_64 =.*|CONFIG_AUFS_INO_T_64 =${inot64}|" \
-     config.mk || return 1
+     config.mk 
   # build
-  make KDIR=/usr/src/linux-${_kernver} || return 1
+  make aufs.ko KDIR=/usr/src/linux-${_kernver} 
 }
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   install -D -m644 fs/aufs/aufs.ko \
-    $pkgdir/lib/modules/${_kernver}/kernel/fs/aufs/aufs.ko || return 1
+    $pkgdir/lib/modules/${_kernver}/kernel/fs/aufs/aufs.ko 
   # tweak the install script for the right kernel version
   sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" \
-    $startdir/$pkgname.install || return 1
+    $startdir/$pkgname.install 
   # install include files
-  install -D -m 644 include/linux/aufs_type.h $pkgdir/usr/src/linux-$_kernver/include/linux/aufs_type.h || return 1
+  install -D -m 644 include/linux/aufs_type.h $pkgdir/usr/src/linux-$_kernver/include/linux/aufs_type.h 
 }
-md5sums=('9ba0666dc200bebb240ac598f9021d9f'
-         '55aac34dd0aa39458b6d927f4b2bddb8')
+md5sums=('630c9c36bd4c0aa75a12b9bfa01ef8ee')
diff --git a/abs/core/aufs2/aufs2.install b/abs/core/aufs2/aufs2.install
index eb5c591..1f5dd45 100644
--- a/abs/core/aufs2/aufs2.install
+++ b/abs/core/aufs2/aufs2.install
@@ -1,5 +1,5 @@
 post_install() {
-  KERNEL_VERSION=2.6.36-LinHES
+  KERNEL_VERSION=2.6.37-LinHES
   depmod $KERNEL_VERSION
 }
 
diff --git a/abs/core/aufs2/create-tarball.sh b/abs/core/aufs2/create-tarball.sh
index 225d455..d4510f4 100755
--- a/abs/core/aufs2/create-tarball.sh
+++ b/abs/core/aufs2/create-tarball.sh
@@ -1,14 +1,14 @@
 #!/bin/sh
-AUFS2VERSION="-36"
-KERNELVERSION=2.6.36
-GITSNAPSHOT=20101021
+AUFS2VERSION=""
+KERNELVERSION=2.6.37
+GITSNAPSHOT=20110105
 # aufs2 (no -xx) for the latest -rc version.
 git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git aufs2-standalone.git
 cd aufs2-standalone.git
-#git checkout origin/aufs2${AUFS2VERSION}
-git checkout origin/aufs2
+#git checkout origin/aufs2.1${AUFS2VERSION}
+git checkout origin/aufs2.1
 #*** apply "aufs2-base.patch" and "aufs2-standalone.patch" to your kernel source files.
 cd ..
-rm -rf aufs2-${KERNELVERSIN}_${GITSNAPSHOT}
+rm -rf aufs2-${KERNELVERSION}_${GITSNAPSHOT}
 cp -a aufs2-standalone.git aufs2-${KERNELVERSION}_${GITSNAPSHOT}
 tar -czf aufs2-${KERNELVERSION}_${GITSNAPSHOT}.tar.gz --exclude=.git aufs2-${KERNELVERSION}_${GITSNAPSHOT}