diff options
| author | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-03-04 09:21:57 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbrodkorb@conet.de> | 2015-03-04 09:21:57 +0100 |
| commit | 4fc74012b67cfc62c5481b8d7b6d95052f40c2bf (patch) | |
| tree | d6f7c860195c63564d98f53c143acbf0082ea3ca /package/aufs-util | |
| parent | 68b4cb5aaa95eb39401bcbaa7c517cfd31c3edcf (diff) | |
| parent | 9919c4bc2f53037331313edace085c386c2af4cc (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/aufs-util')
| -rw-r--r-- | package/aufs-util/Makefile | 44 | ||||
| -rw-r--r-- | package/aufs-util/patches/patch-Makefile | 23 |
2 files changed, 67 insertions, 0 deletions
diff --git a/package/aufs-util/Makefile b/package/aufs-util/Makefile new file mode 100644 index 000000000..fc57c7bb6 --- /dev/null +++ b/package/aufs-util/Makefile @@ -0,0 +1,44 @@ +# This file is part of the OpenADK project. OpenADK is copyrighted +# material, please see the LICENCE file in the top-level directory. + +include $(ADK_TOPDIR)/rules.mk + +PKG_NAME:= aufs-util +# branch aufs3.x-rcN (of around June 6th, 2014) +PKG_VERSION:= a0eb20c75c07299bfc50c3d80023e1d22c86b4cc +PKG_RELEASE:= 1 +PKG_DESCR:= aufs utilities (version 3 and above) +PKG_SECTION:= sys/fs +PKG_URL:= http://aufs.sf.net/ +PKG_SITES:= git://aufs.git.sourceforge.net/gitroot/aufs/aufs-util + +PKG_SUBPKGS:= AUFS_UTIL LIBAU +PKGSD_LIBAU:= aufs userspace library +PKGSC_LIBAU:= libs/misc + +include $(ADK_TOPDIR)/mk/package.mk + +$(eval $(call PKG_template,AUFS_UTIL,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION))) +$(eval $(call PKG_template,LIBAU,libau,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKGSD_LIBAU),$(PKGSC_LIBAU))) + +CONFIG_STYLE:= manual +XAKE_FLAGS+= Install=install \ + HOSTCC="$(HOST_CC)" \ + CPPFLAGS_FOR_BUILD="-I$(STAGING_TARGET_DIR)/usr/include -I./libau" + +aufs-util-install: + $(INSTALL_DIR) $(IDIR_AUFS_UTIL)/sbin + $(INSTALL_BIN) $(WRKINST)/sbin/{{u,}mount.aufs,auplink} \ + $(IDIR_AUFS_UTIL)/sbin + $(INSTALL_DIR) $(IDIR_AUFS_UTIL)/usr/bin + $(INSTALL_BIN) $(WRKINST)/usr/bin/au{brsync,chk} \ + $(IDIR_AUFS_UTIL)/usr/bin + $(INSTALL_DIR) $(IDIR_AUFS_UTIL)/etc/default + $(INSTALL_DATA) $(WRKINST)/etc/default/aufs \ + $(IDIR_AUFS_UTIL)/etc/default + +libau-install: + $(INSTALL_DIR) $(IDIR_LIBAU)/usr/lib + $(CP) $(WRKINST)/usr/lib/libau* $(IDIR_LIBAU)/usr/lib + +include $(ADK_TOPDIR)/mk/pkg-bottom.mk diff --git a/package/aufs-util/patches/patch-Makefile b/package/aufs-util/patches/patch-Makefile new file mode 100644 index 000000000..0253076f1 --- /dev/null +++ b/package/aufs-util/patches/patch-Makefile @@ -0,0 +1,23 @@ + - Ensure correct (HOST-)FLAGS when compiling the intermediates + - Drop version test, this cant work anyway since there is no aufs3.12 branch anywhere +--- w-aufs-util-3.x-rcN-050614-1.orig/Makefile 2014-05-06 15:36:53.000000000 +0200 ++++ w-aufs-util-3.x-rcN-050614-1/Makefile 2014-06-05 14:32:53.496611173 +0200 +@@ -49,7 +49,7 @@ LibUtilObj = perror.o proc_mnt.o br.o pl + LibUtilHdr = au_util.h + export + +-all: ver_test ${Man} ${Bin} ${Etc} ++all: ${Man} ${Bin} ${Etc} + ${MAKE} -C libau $@ + ln -sf ./libau/libau*.so . + +@@ -85,6 +85,9 @@ aufs.5: aufs.in.5 c2tmac + chmod a-w $@ + + c2sh c2tmac ver: CC = ${HOSTCC} ++c2sh c2tmac ver: CFLAGS = ${CFLAGS_FOR_BUILD} ++c2sh c2tmac ver: LDFLAGS = ${LDFLAGS_FOR_BUILD} ++c2sh c2tmac ver: CPPFLAGS = ${CPPFLAGS_FOR_BUILD} + .INTERMEDIATE: c2sh c2tmac ver + + Install = install -o root -g root -p |