add aufs2 kernel patches, update aufs2-util to match

2 files changed, 53 insertions, 7 deletions

diff --git a/package/aufs2-util/Makefile b/package/aufs2-util/Makefile
index 14ceeb4c7..f42767dbe 100644
--- a/package/aufs2-util/Makefile
+++ b/package/aufs2-util/Makefile
@@ -4,16 +4,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=		aufs2-util
-PKG_VERSION:=		2-301210
+PKG_VERSION:=		2-100111
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		83b07d6a6d43362dfc234ecff11367f3
+PKG_MD5SUM:=		1854f5ab560dd375b22f6e2b747cb412
 PKG_DESCR:=		aufs2 utilities
 PKG_SECTION:=		fs
 PKG_URL:=		http://aufs.sf.net/
 
 # created from git via:
-# $ git archive --format tar origin/aufs2 | \
-#          gzip -9 -c >aufs2-util-2-$(date +%d%m%g).tar.gz
+# $ git archive --format tar aufs2.1 | \
+#          gzip -9 -c >../aufs2-util-2-$(date +%d%m%g).tar.gz
 
 PKG_SITES:=		http://nwl.cc/~n0-1/
 WRKDIST=		${WRKDIR}
@@ -29,8 +29,7 @@ $(eval $(call PKG_template,AUFS2_UTIL,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},
 $(eval $(call PKG_template,LIBAU,libau,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKGSD_LIBAU},${PKG_SECTION}))
 
 CONFIG_STYLE:=		manual
-TCFLAGS+=		-I${LINUX_DIR}/include
-XAKE_FLAGS+=		Install=install
+XAKE_FLAGS+=		Install=install HOSTCPPFLAGS="-I${LINUX_HEADER_DIR}/include"
 
 post-install:
 	$(INSTALL_DIR) $(IDIR_AUFS2_UTIL)/sbin
@@ -40,7 +39,7 @@ post-install:
 	$(INSTALL_BIN) ${WRKINST}/usr/bin/au{brsync,chk} \
 		$(IDIR_AUFS2_UTIL)/usr/bin
 	$(INSTALL_DIR) $(IDIR_AUFS2_UTIL)/etc/default
-	$(INSTALL_BIN) ${WRKINST}/etc/default/aufs \
+	$(INSTALL_DATA) ${WRKINST}/etc/default/aufs \
 		$(IDIR_AUFS2_UTIL)/etc/default
 	$(INSTALL_DIR) $(IDIR_LIBAU)/usr/lib
 	${CP} ${WRKINST}/usr/lib/libau* ${IDIR_LIBAU}/usr/lib
diff --git a/package/aufs2-util/patches/patch-Makefile b/package/aufs2-util/patches/patch-Makefile
new file mode 100644
index 000000000..d77ea81ec
--- /dev/null
+++ b/package/aufs2-util/patches/patch-Makefile
@@ -0,0 +1,47 @@
+--- w-aufs2-util-2-100111-1.orig/Makefile	2011-01-07 05:00:54.000000000 +0100
++++ w-aufs2-util-2-100111-1/Makefile	2011-01-10 23:43:23.000000000 +0100
+@@ -15,6 +15,11 @@
+ # along with this program; if not, write to the Free Software
+ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301	 USA
+ 
++c2sh c2tmac: CC = ${HOSTCC}
++c2sh c2tmac: CFLAGS= ${HOSTCFLAGS}
++c2sh c2tmac: LDFLAGS= ${HOSTLDFLAGS}
++c2sh c2tmac: CPPFLAGS= ${HOSTCPPFLAGS} -I./libau -I${LINUX_HEADER_DIR}/include
++
+ CFLAGS += -I./libau
+ CFLAGS += -O -Wall
+ 
+@@ -28,13 +33,10 @@ LibUtilObj = proc_mnt.o br.o plink.o mta
+ LibUtilHdr = au_util.h
+ export
+ 
+-all: ver_test ${Man} ${Bin} ${Etc}
++all: ${Man} ${Bin} ${Etc}
+ 	${MAKE} -C libau $@
+ 	ln -sf ./libau/libau*.so .
+ 
+-ver_test: ver
+-	./ver
+-
+ ${Bin}: LDFLAGS += -static -s
+ ${Bin}: LDLIBS = -L. -lautil
+ ${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil}
+@@ -63,7 +65,7 @@ aufs.5: aufs.in.5 c2tmac
+ 	}' aufs.in.5 >> $@
+ 	chmod a-w $@
+ 
+-.INTERMEDIATE: c2sh c2tmac ver
++.INTERMEDIATE: c2sh c2tmac
+ 
+ Install = install -o root -g root -p
+ install_sbin: File = mount.aufs umount.aufs auplink
+@@ -77,7 +79,7 @@ install_etc: File = etc_default_aufs
+ install_etc: Tgt = ${DESTDIR}/etc/default/aufs
+ install_etc: ${File}
+ 	install -d $(dir ${Tgt})
+-	${Install} -m 644 -T ${File} ${Tgt}
++	${Install} -m 644 ${File} ${Tgt}
+ install_man: File = aufs.5
+ install_man: Tgt = ${DESTDIR}/usr/share/man/man5
+ install_man: ${File}