wok diff aufs-utils/stuff/fix-kdir.patch @ rev 12305
remove linux64-toshiba
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue Apr 17 10:02:09 2012 +0200 (2012-04-17) |
parents | |
children |
line diff
1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 1.2 +++ b/aufs-utils/stuff/fix-kdir.patch Tue Apr 17 10:02:09 2012 +0200 1.3 @@ -0,0 +1,64 @@ 1.4 +diff --git a/Makefile b/Makefile 1.5 +index dc1ba7a..239a21b 100644 1.6 +--- a/Makefile 1.7 ++++ b/Makefile 1.8 +@@ -15,21 +15,7 @@ 1.9 + # along with this program; if not, write to the Free Software 1.10 + # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 1.11 + 1.12 +-ifndef KDIR 1.13 +-KDIR = /lib/modules/$(shell uname -r)/build 1.14 +-endif 1.15 +-ifneq "t" "$(shell test -e ${KDIR}/include/linux/stddef.h && echo t)" 1.16 +-$(error incorrect KDIR) 1.17 +-endif 1.18 +- 1.19 +-ifndef ARCH 1.20 +-ARCH := $(shell uname -m) 1.21 +-endif 1.22 +-ARCH := $(shell echo ${ARCH} | sed -e 's/_64$$//') 1.23 +-ArchDir = ${KDIR}/arch/${ARCH}/include 1.24 +- 1.25 +-CFLAGS += -I${KDIR}/include -I./libau 1.26 +-CFLAGS += $(shell test -d ${ArchDir} && echo -I${ArchDir}) 1.27 ++CFLAGS += -I./libau 1.28 + CFLAGS += -O -Wall 1.29 + 1.30 + Cmd = umount.aufs auchk aubrsync 1.31 +diff --git a/README b/README 1.32 +index f1240e5..a95196d 100644 1.33 +--- a/README 1.34 ++++ b/README 1.35 +@@ -9,17 +9,21 @@ And these are not for aufs1 essentially, except aubrsync. See below in 1.36 + detail. 1.37 + 1.38 + Makefile in this tree has some customizable make-variables. 1.39 +-- KDIR 1.40 +- specify your kernel source path if necessary. 1.41 +- Note: this path should point kernel _source_ path, instead of kernel 1.42 +- _build_ path. Don't confuse with the path in "make O=<kdir>" when you 1.43 +- build a kernel in a different dir. 1.44 +-- CPPFLAGS or ARCH 1.45 +- specify the include path to your aufs2-standalone tree, if necessary. 1.46 +- the makefile finds the correct ${KDIR}/arch/${ARCH}/include dir and 1.47 +- sets the include path to CPPFLAGS="-I...". if the logic in Makefile is 1.48 +- poor and doesn't support your build environment, then set the 1.49 +- variables directly. 1.50 ++- CPPFLAGS 1.51 ++ specify the include path if necessary. 1.52 ++ Some of linux kernel header files are necessary including 1.53 ++ linux/aufs_type.h. If you have installed kernel header files to 1.54 ++ /usr/include, then you may not need to specify CPPFLAGS. 1.55 ++ Otherwise you need to do something like this sample. 1.56 ++ + run "make headers_install" in your kernel source tree, and 1.57 ++ $LinuxSrc/usr/include is created and header files are installed 1.58 ++ there. 1.59 ++ + if you build aufs2 as module from aufs2-standalone.git, then 1.60 ++ $Aufs2Stdalone/usr/include is created and header files are 1.61 ++ installed there. 1.62 ++ + and specify 1.63 ++ CPPFLAGS="-I $LinuxSrc/usr/include -I $Aufs2Stdalone/usr/include" 1.64 ++ 1.65 + - DESTDIR 1.66 + specify your install path if necessary. 1.67 + some commands have to be installed under /sbin.