diff options
Diffstat (limited to 'meta-openembedded/meta-filesystems/recipes-utils/aufs-util')
4 files changed, 169 insertions, 0 deletions
diff --git a/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch b/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch new file mode 100644 index 000000000..6732dc42e --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch @@ -0,0 +1,37 @@ +From daf04dc9ca1f2e4c65ec338ab439e0a792e1a8ac Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 5 Sep 2017 10:36:52 -0700 +Subject: [PATCH] libau: Define STRIP weakly + +STRIP can be set on environment to use cross version of strip utility +hardcoding to strip is not working in cross environment + +Upstream-Status: Submitted + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + libau/Makefile | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libau/Makefile b/libau/Makefile +index 81520ac..c25eef2 100644 +--- a/libau/Makefile ++++ b/libau/Makefile +@@ -25,6 +25,7 @@ LibSoHdr = libau.h rdu.h + LibSoExport = $(addsuffix .exp, $(basename ${LibSoObj})) + LibSoExportErr = $(addsuffix .err, ${LibSoExport}) + LibSoVerScript = verscript ++STRIP ?= strip + + all: ${LibSo} + +@@ -77,7 +78,7 @@ ${LibSo}.${LibSoMajor}.${LibSoMinor}: ${LibSoObj} + ${CC} --shared -Wl,-soname,${LibSo}.${LibSoMajor} \ + -Wl,--version-script,${LibSoVerScript} \ + ${LDFLAGS} -o $@ $^ ${LDLIBS} +- strip -R EXP $@ ++ ${STRIP} -R EXP $@ + # readelf --syms --use-dynamic libau.so + + install_ulib: File = ${LibSo}.${LibSoMajor}.${LibSoMinor} diff --git a/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch b/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch new file mode 100644 index 000000000..c832696a3 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch @@ -0,0 +1,30 @@ +From 13a60c631d7cf6c7e1926473d8069795c0def9b6 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Thu, 19 Jun 2014 15:09:56 +0100 +Subject: [PATCH] aufs-util: add tool concept to Makefile for cross compiling + purpose + +In a cross compilation environment, c2sh, c2tmac and ver need to be created first. +Add a tools target to Makefile to allow for this. + +Upstream-Status: Pending + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index dbbe43d..aff969e 100644 +--- a/Makefile ++++ b/Makefile +@@ -152,7 +152,7 @@ aufs.5: aufs.in.5 c2tmac + chmod a-w $@ + + c2sh c2tmac ver: CC = ${HOSTCC} +-.INTERMEDIATE: c2sh c2tmac ver ++tools: c2sh c2tmac ver + + install_sbin: File = auibusy aumvdown auplink mount.aufs umount.aufs + ifeq (${Glibc},no) diff --git a/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-don-t-strip-executables.patch b/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-don-t-strip-executables.patch new file mode 100644 index 000000000..b40822c0d --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util/aufs-util-don-t-strip-executables.patch @@ -0,0 +1,37 @@ +From 9d5e7eff4ae906f1ea6e6527080fded0b595fbd4 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@windriver.com> +Date: Tue, 9 Apr 2013 18:50:34 -0700 +Subject: [PATCH] aufs-util: don't strip executables + +By default, aufs-util strips its binaries. This produces QA warnings +as follows: + + WARNING: File '/sbin/mount.aufs' from aufs-util was already stripped, this will prevent future debugging! + WARNING: File '/sbin/auplink' from aufs-util was already stripped, this will prevent future debugging! + WARNING: File '/sbin/umount.aufs' from aufs-util was already stripped, this will prevent future debugging! + WARNING: File '/sbin/auibusy' from aufs-util was already stripped, this will prevent future debugging! + WARNING: File '/usr/lib/libau.so.2.6' from aufs-util was already stripped, this will prevent future debugging! + +To prevent this, we remove -s from LDFLAGS. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 54f8d97..dbbe43d 100644 +--- a/Makefile ++++ b/Makefile +@@ -118,7 +118,7 @@ clean: + ver_test: ver + ./ver + +-${Bin}: override LDFLAGS += -static -s ++${Bin}: override LDFLAGS += -static + ${Bin}: LDLIBS = -L. -lautil + ${BinObj}: %.o: %.c ${LibUtilHdr} ${LibUtil} + diff --git a/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb b/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb new file mode 100644 index 000000000..2e855e313 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb @@ -0,0 +1,65 @@ +SUMMARY = "Tools for managing AUFS mounts" +SECTION = "base" +HOMEPAGE = "http://aufs.sourceforge.net/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" + +DEPENDS = "coreutils-native aufs-util-native" +DEPENDS_class-native = "" + +SRCREV = "89afb1806c3d2eed8db2666ae254b77518ae3ceb" +SRC_URI = "git://git.code.sf.net/p/aufs/aufs-util;protocol=git;branch=aufs4.4 \ + https://raw.githubusercontent.com/sfjro/aufs4-linux/aufs4.4/include/uapi/linux/aufs_type.h;name=aufs_type \ + file://aufs-util-don-t-strip-executables.patch \ + file://aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch \ + file://0001-libau-Define-STRIP-weakly.patch \ +" +SRC_URI[aufs_type.md5sum] = "f7b4a255dcb55fe7b0967f5f59b44f19" +SRC_URI[aufs_type.sha256sum] = "85bc8e4c1a94a7d526c382e4b047b4256cab8c4a65fc0396291707ad9a327a18" + +PV = "4.4+git${SRCPV}" + +S = "${WORKDIR}/git" + +export HOSTCC = "${BUILD_CC}" +do_configure_prepend() { + # Replace sbin,bin paths with bitbake environment + sed -i -e 's;install_sbin: Tgt = ${DESTDIR}/sbin;install_sbin: Tgt = ${DESTDIR}/${base_sbindir};' \ + -e 's;install_ubin: Tgt = ${DESTDIR}/usr/sbin;install_sbin: Tgt = ${DESTDIR}/${bindir};' \ + ${S}/Makefile +} + +do_configure_append () { + install -d ${S}/include/linux/ + cp ${WORKDIR}/aufs_type.h ${S}/include/linux/ + sed -i -e 's;__user;;' ${S}/include/linux/aufs_type.h +} + +do_configure_append_class-target () { + for i in ver c2sh c2tmac; do + cp ${STAGING_BINDIR_NATIVE}/aufs-util-${PV}/$i ${B} + done +} + +do_compile () { + oe_runmake CPPFLAGS="-I${S}/include -I${S}/libau" +} + +do_compile_class-native () { + oe_runmake tools CPPFLAGS="-I${S}/include -I${S}/libau" CC="${BUILD_CC}" +} + +do_install () { + oe_runmake 'DESTDIR=${D}' install_sbin install_ubin install_etc +} + +do_install_class-native () { + install -d ${D}${bindir}/aufs-util-${PV} + for i in ver c2sh c2tmac; do + install -m 755 $i ${D}${bindir}/aufs-util-${PV}/$i + done +} + +RRECOMMENDS_${PN} += "kernel-module-aufs" + +BBCLASSEXTEND = "native" |
