]> code.ossystems Code Review - openembedded-core.git/commitdiff
staging.bbclass: Fix wrong library paths in sysroot_strip
authorJunling Zheng <zhengjunling@huawei.com>
Sat, 16 Nov 2019 14:12:13 +0000 (22:12 +0800)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 25 Nov 2019 22:03:43 +0000 (22:03 +0000)
Do not reset libdir and base_libdir in sysroot_strip, and just pass crude
paths as they will be reset later in strip_execs.

Signed-off-by: Junling Zheng <zhengjunling@huawei.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/staging.bbclass

index cca0b7e0d680d7ac4751fd968190205af8ec0660..7e108950f5f73f90f1891078bbf5341bc45f2c70 100644 (file)
@@ -75,8 +75,8 @@ python sysroot_strip () {
 
     dstdir = d.getVar('SYSROOT_DESTDIR')
     pn = d.getVar('PN')
-    libdir = os.path.abspath(dstdir + os.sep + d.getVar("libdir"))
-    base_libdir = os.path.abspath(dstdir + os.sep + d.getVar("base_libdir"))
+    libdir = d.getVar("libdir")
+    base_libdir = d.getVar("base_libdir")
     qa_already_stripped = 'already-stripped' in (d.getVar('INSANE_SKIP_' + pn) or "").split()
     strip_cmd = d.getVar("STRIP")