summaryrefslogtreecommitdiffstats
path: root/meta-filesystems
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2018-07-05 14:22:01 +0800
committerKhem Raj <raj.khem@gmail.com>2018-07-05 10:19:03 -0700
commit7040a7528060b981c7f4c354781813bf5ec63695 (patch)
treef95647f40bdc41afcb80c26726714751f7df44c7 /meta-filesystems
parentfb420dde3e9bc4b7e2e058bfd9c0d20c0d342142 (diff)
downloadmeta-openembedded-7040a7528060b981c7f4c354781813bf5ec63695.tar.gz
aufs-util: upgrade 4.4 -> 4.9
Drop 0001-libau-Define-STRIP-weakly.patch since it had been merged upstream. Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-filesystems')
-rw-r--r--meta-filesystems/recipes-utils/aufs-util/aufs-util/0001-libau-Define-STRIP-weakly.patch37
-rw-r--r--meta-filesystems/recipes-utils/aufs-util/aufs-util_git.bb13
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 @@
1From daf04dc9ca1f2e4c65ec338ab439e0a792e1a8ac Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 5 Sep 2017 10:36:52 -0700
4Subject: [PATCH] libau: Define STRIP weakly
5
6STRIP can be set on environment to use cross version of strip utility
7hardcoding to strip is not working in cross environment
8
9Upstream-Status: Submitted
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12
13---
14 libau/Makefile | 3 ++-
15 1 file changed, 2 insertions(+), 1 deletion(-)
16
17diff --git a/libau/Makefile b/libau/Makefile
18index 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"
7DEPENDS = "coreutils-native aufs-util-native" 7DEPENDS = "coreutils-native aufs-util-native"
8DEPENDS_class-native = "" 8DEPENDS_class-native = ""
9 9
10SRCREV = "89afb1806c3d2eed8db2666ae254b77518ae3ceb" 10SRCREV = "568636e5c45006b1e6e0c4b704401610a02c0089"
11SRC_URI = "git://git.code.sf.net/p/aufs/aufs-util;protocol=git;branch=aufs4.4 \ 11SRC_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"
17SRC_URI[aufs_type.md5sum] = "f7b4a255dcb55fe7b0967f5f59b44f19" 16SRC_URI[aufs_type.md5sum] = "b37129ef0703de72a852db7e48bdedc6"
18SRC_URI[aufs_type.sha256sum] = "85bc8e4c1a94a7d526c382e4b047b4256cab8c4a65fc0396291707ad9a327a18" 17SRC_URI[aufs_type.sha256sum] = "7ff6566adb9c7a3b6862cdc85a690ab546f1d0bc81ddd595fd663c0a69031683"
19 18
20UPSTREAM_CHECK_COMMITS = "1" 19UPSTREAM_CHECK_COMMITS = "1"
21 20
22PV = "4.4+git${SRCPV}" 21PV = "4.9+git${SRCPV}"
23 22
24S = "${WORKDIR}/git" 23S = "${WORKDIR}/git"
25 24