summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-11-25 22:14:54 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-01-08 20:14:42 +0000
commit117da4d473b6c25d30afb0948fc5cc9676c41cbe (patch)
treeec4ee1f61255e4b42db6f21fcb9149d18ea9198e /meta
parente92d3cfbb47a9fb671752e0340117c1730cfaa50 (diff)
downloadpoky-117da4d473b6c25d30afb0948fc5cc9676c41cbe.tar.gz
multilib_script: fix packages split
In multilib_script.bbclass it renames script file which listed in MULTILIB_SCRIPTS. It may mix up packages split. Take package curl as example, ${bindir}/curl-config is packaged to curl-dev originally. But it is renamed to curl-config-${MULTILIB_SUFFIX} and packaged to curl when multilib is enabled. And expand 'pkg' to fix QA warning: | WARNING: Variable key FILES_${PN}-dev ( | ${bindir}/curl-config-${MULTILIB_SUFFIX}) replaces original key | FILES_curl-dev (${includedir} ${FILES_SOLIBSDEV} ... ${bindir}/*-config) Insert a necessary space to the argument 'value' of d.appendVar() as well. (From OE-Core rev: 841bcbe429dcab54de3b89a927394750f9ccae60) (From OE-Core rev: de222b08fbcc46f60da811a5542d20a9346c32df) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/multilib_script.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/multilib_script.bbclass b/meta/classes/multilib_script.bbclass
index 51c9fcc12c..dc166d06c1 100644
--- a/meta/classes/multilib_script.bbclass
+++ b/meta/classes/multilib_script.bbclass
@@ -24,9 +24,11 @@ python () {
24 24
25 for entry in (d.getVar("MULTILIB_SCRIPTS", False) or "").split(): 25 for entry in (d.getVar("MULTILIB_SCRIPTS", False) or "").split():
26 pkg, script = entry.split(":") 26 pkg, script = entry.split(":")
27 epkg = d.expand(pkg)
27 scriptname = os.path.basename(script) 28 scriptname = os.path.basename(script)
28 d.appendVar("ALTERNATIVE_" + pkg, scriptname + " ") 29 d.appendVar("ALTERNATIVE_" + epkg, " " + scriptname + " ")
29 d.setVarFlag("ALTERNATIVE_LINK_NAME", scriptname, script) 30 d.setVarFlag("ALTERNATIVE_LINK_NAME", scriptname, script)
30 d.setVarFlag("ALTERNATIVE_TARGET", scriptname, script + "-${MULTILIB_SUFFIX}") 31 d.setVarFlag("ALTERNATIVE_TARGET", scriptname, script + "-${MULTILIB_SUFFIX}")
31 d.appendVar("multilibscript_rename", "\n mv ${PKGD}" + script + " ${PKGD}" + script + "-${MULTILIB_SUFFIX}") 32 d.appendVar("multilibscript_rename", "\n mv ${PKGD}" + script + " ${PKGD}" + script + "-${MULTILIB_SUFFIX}")
33 d.appendVar("FILES_" + epkg, " " + script + "-${MULTILIB_SUFFIX}")
32} 34}