[arch-commits] Commit in aufs2/trunk (PKGBUILD create-tarball.sh)

[Tobias Powalowski]

    Date: Monday, January 24, 2011 @ 14:05:04
  Author: tpowa
Revision: 107419

upgpkg: aufs2 2.6.37_20110124-1
rebuild against latest .37 snapshot

Modified:
  aufs2/trunk/PKGBUILD
  aufs2/trunk/create-tarball.sh

-------------------+
 PKGBUILD          |   15 ++++++++-------
 create-tarball.sh |    8 ++++----
 2 files changed, 12 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-01-24 19:02:22 UTC (rev 107418)
+++ PKGBUILD	2011-01-24 19:05:04 UTC (rev 107419)
@@ -2,7 +2,7 @@
 # Maintainer: Paul Mattal <pjmattal at elys.com>
 
 pkgname=aufs2
-pkgver=2.6.37_20110105
+pkgver=2.6.37_20110124
 pkgrel=1
 #_kernver=${pkgver%_*}-ARCH
 _kernver=2.6.37-ARCH
@@ -15,7 +15,6 @@
 replaces=('aufs')
 install=${pkgname}.install
 source=("ftp://ftp.archlinux.org/other/aufs2/${pkgname}-${pkgver}.tar.gz")
-       #aufs2-module-2.6.36.patch)
 options=('!makeflags')
 
 build() {
@@ -42,8 +41,10 @@
   fi
   sed -i "s|CONFIG_AUFS_INO_T_64 =.*|CONFIG_AUFS_INO_T_64 =${inot64}|" \
      config.mk 
-  # build
-  make aufs.ko KDIR=/usr/src/linux-${_kernver} 
+  # build, sed fixes are from gentoo portage build
+  sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile
+  sed -i "s:__user::g" include/linux/aufs_type.h
+  make KDIR=/usr/src/linux-${_kernver}
 }
 
 package() {
@@ -52,8 +53,8 @@
     $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 
+    $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 
+  install -D -m 644 include/linux/aufs_type.h $pkgdir/usr/include/linux/aufs_type.h 
 }
-md5sums=('630c9c36bd4c0aa75a12b9bfa01ef8ee')
+md5sums=('fa64d7893490ef9c82310ebd5f730443')

Modified: create-tarball.sh
===================================================================
--- create-tarball.sh	2011-01-24 19:02:22 UTC (rev 107418)
+++ create-tarball.sh	2011-01-24 19:05:04 UTC (rev 107419)
@@ -1,12 +1,12 @@
 #!/bin/sh
-AUFS2VERSION=""
+AUFS2VERSION="-37"
 KERNELVERSION=2.6.37
-GITSNAPSHOT=20110105
+GITSNAPSHOT=20110124
 # 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.1${AUFS2VERSION}
-git checkout origin/aufs2.1
+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-${KERNELVERSION}_${GITSNAPSHOT}