# HG changeset patch # User Christopher Rogers # Date 1287025284 0 # Node ID 938f73ef864a0570ca2a7d1f7cc1900a2b483de7 # Parent a242ab6705d6b415ec011a8d45425caef0976f14 Up: aufs-utils to 20101014. Added support to back up source code into a .tar.gz. Also added linux-module-headers as build depend since it builds with it. Added a fix-kdir.patch since it was KDIR support was remove from newer git version. diff -r a242ab6705d6 -r 938f73ef864a aufs-utils/receipt --- a/aufs-utils/receipt Thu Oct 14 02:56:08 2010 +0000 +++ b/aufs-utils/receipt Thu Oct 14 03:01:24 2010 +0000 @@ -1,28 +1,32 @@ # SliTaz package receipt. PACKAGE="aufs-utils" -VERSION="20100916" +VERSION="20101014" CATEGORY="system-tools" SHORT_DESC="The aufs utils." MAINTAINER="pankso@slitaz.org" DEPENDS="linux-aufs" -BUILD_DEPENDS="git" +BUILD_DEPENDS="git linux-module-headers" WEB_SITE="http://aufs.sourceforge.net/" # Rules to configure and make the package. compile_rules() { [ -d "$PACKAGE-$VERSION" ] && rm -rf $PACKAGE-$VERSION - git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-util.git \ - $PACKAGE-$VERSION + TARBALL=$SOURCES_REPOSITORY/$PACKAGE-$VERSION.tar.gz + if [ -f $TARBALL ]; then + tar xzf $TARBALL + else + git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-util.git $PACKAGE-$VERSION + tar czf $TARBALL $PACKAGE-$VERSION + fi + KERNEL_VERSION=`grep ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'` - if [ ! -d $WOK/linux/linux-$KERNEL_VERSION ]; then - tazwok cook linux - fi cd $src + patch -p1 -R < $WOK/$PACKAGE/stuff/fix-kdir.patch sed -i 's/-m 644 -T/-m 644/' Makefile - make KDIR=$WOK/linux/linux-$KERNEL_VERSION && - make KDIR=$WOK/linux/linux-$KERNEL_VERSION DESTDIR=$PWD/_pkg install + make && + make DESTDIR=$PWD/_pkg install } # Rules to gen a SliTaz package suitable for Tazpkg. diff -r a242ab6705d6 -r 938f73ef864a aufs-utils/stuff/fix-kdir.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/aufs-utils/stuff/fix-kdir.patch Thu Oct 14 03:01:24 2010 +0000 @@ -0,0 +1,64 @@ +diff --git a/Makefile b/Makefile +index dc1ba7a..239a21b 100644 +--- a/Makefile ++++ b/Makefile +@@ -15,21 +15,7 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +-ifndef KDIR +-KDIR = /lib/modules/$(shell uname -r)/build +-endif +-ifneq "t" "$(shell test -e ${KDIR}/include/linux/stddef.h && echo t)" +-$(error incorrect KDIR) +-endif +- +-ifndef ARCH +-ARCH := $(shell uname -m) +-endif +-ARCH := $(shell echo ${ARCH} | sed -e 's/_64$$//') +-ArchDir = ${KDIR}/arch/${ARCH}/include +- +-CFLAGS += -I${KDIR}/include -I./libau +-CFLAGS += $(shell test -d ${ArchDir} && echo -I${ArchDir}) ++CFLAGS += -I./libau + CFLAGS += -O -Wall + + Cmd = umount.aufs auchk aubrsync +diff --git a/README b/README +index f1240e5..a95196d 100644 +--- a/README ++++ b/README +@@ -9,17 +9,21 @@ And these are not for aufs1 essentially, except aubrsync. See below in + detail. + + Makefile in this tree has some customizable make-variables. +-- KDIR +- specify your kernel source path if necessary. +- Note: this path should point kernel _source_ path, instead of kernel +- _build_ path. Don't confuse with the path in "make O=" when you +- build a kernel in a different dir. +-- CPPFLAGS or ARCH +- specify the include path to your aufs2-standalone tree, if necessary. +- the makefile finds the correct ${KDIR}/arch/${ARCH}/include dir and +- sets the include path to CPPFLAGS="-I...". if the logic in Makefile is +- poor and doesn't support your build environment, then set the +- variables directly. ++- CPPFLAGS ++ specify the include path if necessary. ++ Some of linux kernel header files are necessary including ++ linux/aufs_type.h. If you have installed kernel header files to ++ /usr/include, then you may not need to specify CPPFLAGS. ++ Otherwise you need to do something like this sample. ++ + run "make headers_install" in your kernel source tree, and ++ $LinuxSrc/usr/include is created and header files are installed ++ there. ++ + if you build aufs2 as module from aufs2-standalone.git, then ++ $Aufs2Stdalone/usr/include is created and header files are ++ installed there. ++ + and specify ++ CPPFLAGS="-I $LinuxSrc/usr/include -I $Aufs2Stdalone/usr/include" ++ + - DESTDIR + specify your install path if necessary. + some commands have to be installed under /sbin.