diff options
Diffstat (limited to 'meta-filesystems')
-rw-r--r-- | meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch | 37 | ||||
-rw-r--r-- | meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb | 13 |
2 files changed, 6 insertions, 44 deletions
diff --git a/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch b/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch deleted file mode 100644 index 6732dc42e..000000000 --- a/meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From daf04dc9ca1f2e4c65ec338ab439e0a792e1a8ac Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 5 Sep 2017 10:36:52 -0700 | ||
4 | Subject: [PATCH] libau: Define STRIP weakly | ||
5 | |||
6 | STRIP can be set on environment to use cross version of strip utility | ||
7 | hardcoding to strip is not working in cross environment | ||
8 | |||
9 | Upstream-Status: Submitted | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | |||
13 | --- | ||
14 | libau/Makefile | 3 ++- | ||
15 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
16 | |||
17 | diff --git a/libau/Makefile b/libau/Makefile | ||
18 | index 81520ac..c25eef2 100644 | ||
19 | --- a/libau/Makefile | ||
20 | +++ b/libau/Makefile | ||
21 | @@ -25,6 +25,7 @@ LibSoHdr = libau.h rdu.h | ||
22 | LibSoExport = $(addsuffix .exp, $(basename ${LibSoObj})) | ||
23 | LibSoExportErr = $(addsuffix .err, ${LibSoExport}) | ||
24 | LibSoVerScript = verscript | ||
25 | +STRIP ?= strip | ||
26 | |||
27 | all: ${LibSo} | ||
28 | |||
29 | @@ -77,7 +78,7 @@ ${LibSo}.${LibSoMajor}.${LibSoMinor}: ${LibSoObj} | ||
30 | ${CC} --shared -Wl,-soname,${LibSo}.${LibSoMajor} \ | ||
31 | -Wl,--version-script,${LibSoVerScript} \ | ||
32 | ${LDFLAGS} -o $@ $^ ${LDLIBS} | ||
33 | - strip -R EXP $@ | ||
34 | + ${STRIP} -R EXP $@ | ||
35 | # readelf --syms --use-dynamic libau.so | ||
36 | |||
37 | install_ulib: File = ${LibSo}.${LibSoMajor}.${LibSoMinor} | ||
diff --git a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb index 64eb94064..cdee11e82 100644 --- a/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb +++ b/meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb | |||
@@ -7,19 +7,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=892f569a555ba9c07a568a7c0c4fa63a" | |||
7 | DEPENDS = "coreutils-native aufs-util-native" | 7 | DEPENDS = "coreutils-native aufs-util-native" |
8 | DEPENDS_class-native = "" | 8 | DEPENDS_class-native = "" |
9 | 9 | ||
10 | SRCREV = "89afb1806c3d2eed8db2666ae254b77518ae3ceb" | 10 | SRCREV = "568636e5c45006b1e6e0c4b704401610a02c0089" |
11 | SRC_URI = "git://git.code.sf.net/p/aufs/aufs-util;protocol=git;branch=aufs4.4 \ | 11 | SRC_URI = "git://git.code.sf.net/p/aufs/aufs-util;protocol=git;branch=aufs4.9 \ |
12 | https://raw.githubusercontent.com/sfjro/aufs4-linux/aufs4.4/include/uapi/linux/aufs_type.h;name=aufs_type \ | 12 | https://raw.githubusercontent.com/sfjro/aufs4-linux/aufs4.9/include/uapi/linux/aufs_type.h;name=aufs_type \ |
13 | file://aufs-util-don-t-strip-executables.patch \ | 13 | file://aufs-util-don-t-strip-executables.patch \ |
14 | file://aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch \ | 14 | file://aufs-util-add-tool-concept-to-Makefile-for-cross-com.patch \ |
15 | file://0001-libau-Define-STRIP-weakly.patch \ | ||
16 | " | 15 | " |
17 | SRC_URI[aufs_type.md5sum] = "f7b4a255dcb55fe7b0967f5f59b44f19" | 16 | SRC_URI[aufs_type.md5sum] = "b37129ef0703de72a852db7e48bdedc6" |
18 | SRC_URI[aufs_type.sha256sum] = "85bc8e4c1a94a7d526c382e4b047b4256cab8c4a65fc0396291707ad9a327a18" | 17 | SRC_URI[aufs_type.sha256sum] = "7ff6566adb9c7a3b6862cdc85a690ab546f1d0bc81ddd595fd663c0a69031683" |
19 | 18 | ||
20 | UPSTREAM_CHECK_COMMITS = "1" | 19 | UPSTREAM_CHECK_COMMITS = "1" |
21 | 20 | ||
22 | PV = "4.4+git${SRCPV}" | 21 | PV = "4.9+git${SRCPV}" |
23 | 22 | ||
24 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |
25 | 24 | ||