wok view aufs-utils/stuff/fix-kdir.patch @ rev 21422
updated matio and matio-dev (1.5.2 -> 1.5.15)
| author | Hans-G?nter Theisgen |
|---|---|
| date | Wed Apr 24 17:37:50 2019 +0100 (2019-04-24) |
| parents | |
| children |
line source
1 diff --git a/Makefile b/Makefile
2 index dc1ba7a..239a21b 100644
3 --- a/Makefile
4 +++ b/Makefile
5 @@ -15,21 +15,7 @@
6 # along with this program; if not, write to the Free Software
7 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
9 -ifndef KDIR
10 -KDIR = /lib/modules/$(shell uname -r)/build
11 -endif
12 -ifneq "t" "$(shell test -e ${KDIR}/include/linux/stddef.h && echo t)"
13 -$(error incorrect KDIR)
14 -endif
15 -
16 -ifndef ARCH
17 -ARCH := $(shell uname -m)
18 -endif
19 -ARCH := $(shell echo ${ARCH} | sed -e 's/_64$$//')
20 -ArchDir = ${KDIR}/arch/${ARCH}/include
21 -
22 -CFLAGS += -I${KDIR}/include -I./libau
23 -CFLAGS += $(shell test -d ${ArchDir} && echo -I${ArchDir})
24 +CFLAGS += -I./libau
25 CFLAGS += -O -Wall
27 Cmd = umount.aufs auchk aubrsync
28 diff --git a/README b/README
29 index f1240e5..a95196d 100644
30 --- a/README
31 +++ b/README
32 @@ -9,17 +9,21 @@ And these are not for aufs1 essentially, except aubrsync. See below in
33 detail.
35 Makefile in this tree has some customizable make-variables.
36 -- KDIR
37 - specify your kernel source path if necessary.
38 - Note: this path should point kernel _source_ path, instead of kernel
39 - _build_ path. Don't confuse with the path in "make O=<kdir>" when you
40 - build a kernel in a different dir.
41 -- CPPFLAGS or ARCH
42 - specify the include path to your aufs2-standalone tree, if necessary.
43 - the makefile finds the correct ${KDIR}/arch/${ARCH}/include dir and
44 - sets the include path to CPPFLAGS="-I...". if the logic in Makefile is
45 - poor and doesn't support your build environment, then set the
46 - variables directly.
47 +- CPPFLAGS
48 + specify the include path if necessary.
49 + Some of linux kernel header files are necessary including
50 + linux/aufs_type.h. If you have installed kernel header files to
51 + /usr/include, then you may not need to specify CPPFLAGS.
52 + Otherwise you need to do something like this sample.
53 + + run "make headers_install" in your kernel source tree, and
54 + $LinuxSrc/usr/include is created and header files are installed
55 + there.
56 + + if you build aufs2 as module from aufs2-standalone.git, then
57 + $Aufs2Stdalone/usr/include is created and header files are
58 + installed there.
59 + + and specify
60 + CPPFLAGS="-I $LinuxSrc/usr/include -I $Aufs2Stdalone/usr/include"
61 +
62 - DESTDIR
63 specify your install path if necessary.
64 some commands have to be installed under /sbin.