summaryrefslogtreecommitdiffstats
path: root/meta/classes/multilib_script.bbclass
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2018-11-26 03:14:54 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-11-27 22:13:11 (GMT)
commit8d53253d0a7b2ebe6438affe7ed2a7a74d129e61 (patch)
tree641728b292c0b526432a2f684ee4aad39f794798 /meta/classes/multilib_script.bbclass
parentd0b2cedfb0996739c79a1011159b4047988851bf (diff)
downloadpoky-8d53253d0a7b2ebe6438affe7ed2a7a74d129e61.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) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/multilib_script.bbclass')
-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 51c9fcc..dc166d0 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}