summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJunling Zheng <zhengjunling@huawei.com>2019-11-16 22:12:13 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-11-27 13:25:18 +0000
commitb7fbe1a597b1225b6e050bef193b4a8984754167 (patch)
tree635b8e27d66e493e49572ac3a9e1c3db752971aa /meta
parent63dd6190cbd5c64780522576e8df0aef66b711d8 (diff)
downloadpoky-b7fbe1a597b1225b6e050bef193b4a8984754167.tar.gz
staging.bbclass: Fix wrong library paths in sysroot_strip
Do not reset libdir and base_libdir in sysroot_strip, and just pass crude paths as they will be reset later in strip_execs. (From OE-Core rev: eab7f448aa537539b45ee21df4ea25de97e60a7e) Signed-off-by: Junling Zheng <zhengjunling@huawei.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/staging.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass
index cca0b7e0d6..7e108950f5 100644
--- a/meta/classes/staging.bbclass
+++ b/meta/classes/staging.bbclass
@@ -75,8 +75,8 @@ python sysroot_strip () {
75 75
76 dstdir = d.getVar('SYSROOT_DESTDIR') 76 dstdir = d.getVar('SYSROOT_DESTDIR')
77 pn = d.getVar('PN') 77 pn = d.getVar('PN')
78 libdir = os.path.abspath(dstdir + os.sep + d.getVar("libdir")) 78 libdir = d.getVar("libdir")
79 base_libdir = os.path.abspath(dstdir + os.sep + d.getVar("base_libdir")) 79 base_libdir = d.getVar("base_libdir")
80 qa_already_stripped = 'already-stripped' in (d.getVar('INSANE_SKIP_' + pn) or "").split() 80 qa_already_stripped = 'already-stripped' in (d.getVar('INSANE_SKIP_' + pn) or "").split()
81 strip_cmd = d.getVar("STRIP") 81 strip_cmd = d.getVar("STRIP")
82 82