wok-6.x rev 6711
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.
author | Christopher Rogers <slaxemulator@gmail.com> |
---|---|
date | Thu Oct 14 03:01:24 2010 +0000 (2010-10-14) |
parents | a242ab6705d6 |
children | 85369140d63a |
files | aufs-utils/receipt aufs-utils/stuff/fix-kdir.patch |
line diff
1.1 --- a/aufs-utils/receipt Thu Oct 14 02:56:08 2010 +0000 1.2 +++ b/aufs-utils/receipt Thu Oct 14 03:01:24 2010 +0000 1.3 @@ -1,28 +1,32 @@ 1.4 # SliTaz package receipt. 1.5 1.6 PACKAGE="aufs-utils" 1.7 -VERSION="20100916" 1.8 +VERSION="20101014" 1.9 CATEGORY="system-tools" 1.10 SHORT_DESC="The aufs utils." 1.11 MAINTAINER="pankso@slitaz.org" 1.12 DEPENDS="linux-aufs" 1.13 -BUILD_DEPENDS="git" 1.14 +BUILD_DEPENDS="git linux-module-headers" 1.15 WEB_SITE="http://aufs.sourceforge.net/" 1.16 1.17 # Rules to configure and make the package. 1.18 compile_rules() 1.19 { 1.20 [ -d "$PACKAGE-$VERSION" ] && rm -rf $PACKAGE-$VERSION 1.21 - git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-util.git \ 1.22 - $PACKAGE-$VERSION 1.23 + TARBALL=$SOURCES_REPOSITORY/$PACKAGE-$VERSION.tar.gz 1.24 + if [ -f $TARBALL ]; then 1.25 + tar xzf $TARBALL 1.26 + else 1.27 + git clone http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-util.git $PACKAGE-$VERSION 1.28 + tar czf $TARBALL $PACKAGE-$VERSION 1.29 + fi 1.30 + 1.31 KERNEL_VERSION=`grep ^VERSION= $WOK/linux/receipt | cut -d "=" -f2 | sed -e 's/"//g'` 1.32 - if [ ! -d $WOK/linux/linux-$KERNEL_VERSION ]; then 1.33 - tazwok cook linux 1.34 - fi 1.35 cd $src 1.36 + patch -p1 -R < $WOK/$PACKAGE/stuff/fix-kdir.patch 1.37 sed -i 's/-m 644 -T/-m 644/' Makefile 1.38 - make KDIR=$WOK/linux/linux-$KERNEL_VERSION && 1.39 - make KDIR=$WOK/linux/linux-$KERNEL_VERSION DESTDIR=$PWD/_pkg install 1.40 + make && 1.41 + make DESTDIR=$PWD/_pkg install 1.42 } 1.43 1.44 # Rules to gen a SliTaz package suitable for Tazpkg.
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 2.2 +++ b/aufs-utils/stuff/fix-kdir.patch Thu Oct 14 03:01:24 2010 +0000 2.3 @@ -0,0 +1,64 @@ 2.4 +diff --git a/Makefile b/Makefile 2.5 +index dc1ba7a..239a21b 100644 2.6 +--- a/Makefile 2.7 ++++ b/Makefile 2.8 +@@ -15,21 +15,7 @@ 2.9 + # along with this program; if not, write to the Free Software 2.10 + # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 2.11 + 2.12 +-ifndef KDIR 2.13 +-KDIR = /lib/modules/$(shell uname -r)/build 2.14 +-endif 2.15 +-ifneq "t" "$(shell test -e ${KDIR}/include/linux/stddef.h && echo t)" 2.16 +-$(error incorrect KDIR) 2.17 +-endif 2.18 +- 2.19 +-ifndef ARCH 2.20 +-ARCH := $(shell uname -m) 2.21 +-endif 2.22 +-ARCH := $(shell echo ${ARCH} | sed -e 's/_64$$//') 2.23 +-ArchDir = ${KDIR}/arch/${ARCH}/include 2.24 +- 2.25 +-CFLAGS += -I${KDIR}/include -I./libau 2.26 +-CFLAGS += $(shell test -d ${ArchDir} && echo -I${ArchDir}) 2.27 ++CFLAGS += -I./libau 2.28 + CFLAGS += -O -Wall 2.29 + 2.30 + Cmd = umount.aufs auchk aubrsync 2.31 +diff --git a/README b/README 2.32 +index f1240e5..a95196d 100644 2.33 +--- a/README 2.34 ++++ b/README 2.35 +@@ -9,17 +9,21 @@ And these are not for aufs1 essentially, except aubrsync. See below in 2.36 + detail. 2.37 + 2.38 + Makefile in this tree has some customizable make-variables. 2.39 +-- KDIR 2.40 +- specify your kernel source path if necessary. 2.41 +- Note: this path should point kernel _source_ path, instead of kernel 2.42 +- _build_ path. Don't confuse with the path in "make O=<kdir>" when you 2.43 +- build a kernel in a different dir. 2.44 +-- CPPFLAGS or ARCH 2.45 +- specify the include path to your aufs2-standalone tree, if necessary. 2.46 +- the makefile finds the correct ${KDIR}/arch/${ARCH}/include dir and 2.47 +- sets the include path to CPPFLAGS="-I...". if the logic in Makefile is 2.48 +- poor and doesn't support your build environment, then set the 2.49 +- variables directly. 2.50 ++- CPPFLAGS 2.51 ++ specify the include path if necessary. 2.52 ++ Some of linux kernel header files are necessary including 2.53 ++ linux/aufs_type.h. If you have installed kernel header files to 2.54 ++ /usr/include, then you may not need to specify CPPFLAGS. 2.55 ++ Otherwise you need to do something like this sample. 2.56 ++ + run "make headers_install" in your kernel source tree, and 2.57 ++ $LinuxSrc/usr/include is created and header files are installed 2.58 ++ there. 2.59 ++ + if you build aufs2 as module from aufs2-standalone.git, then 2.60 ++ $Aufs2Stdalone/usr/include is created and header files are 2.61 ++ installed there. 2.62 ++ + and specify 2.63 ++ CPPFLAGS="-I $LinuxSrc/usr/include -I $Aufs2Stdalone/usr/include" 2.64 ++ 2.65 + - DESTDIR 2.66 + specify your install path if necessary. 2.67 + some commands have to be installed under /sbin.