diff options
author | Zhixiong Chi <zhixiong.chi@windriver.com> | 2018-08-10 00:31:34 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-14 11:36:31 +0100 |
commit | ecd4ac1962424557128e965f660720dfb815877e (patch) | |
tree | 094d56aa9702e14c036289e7399bead75d3cc6db /meta/classes/multilib_script.bbclass | |
parent | e02e5c52fdc5e37670bb6d0e3e81675cdbee04ae (diff) | |
download | poky-ecd4ac1962424557128e965f660720dfb815877e.tar.gz |
multilib-script: Fix ALTERNATIVE_${PN} overwrite issue
If multilib scripts handle more than one file per package, the variable
ALTERNATIVE_${PN} will be overwritten and there will be only one symbol
link file. Append to the variable to avoid this.
(From OE-Core rev: f474a7ed02acaffe5d0fcc67e06dde17fc8e4d0e)
Signed-off-by: Zhixiong Chi <zhixiong.chi@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.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/multilib_script.bbclass b/meta/classes/multilib_script.bbclass index a5a552b716..51c9fcc12c 100644 --- a/meta/classes/multilib_script.bbclass +++ b/meta/classes/multilib_script.bbclass | |||
@@ -25,7 +25,7 @@ python () { | |||
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 | scriptname = os.path.basename(script) | 27 | scriptname = os.path.basename(script) |
28 | d.setVar("ALTERNATIVE_" + pkg, scriptname) | 28 | d.appendVar("ALTERNATIVE_" + pkg, scriptname + " ") |
29 | d.setVarFlag("ALTERNATIVE_LINK_NAME", scriptname, script) | 29 | d.setVarFlag("ALTERNATIVE_LINK_NAME", scriptname, script) |
30 | d.setVarFlag("ALTERNATIVE_TARGET", scriptname, script + "-${MULTILIB_SUFFIX}") | 30 | d.setVarFlag("ALTERNATIVE_TARGET", scriptname, script + "-${MULTILIB_SUFFIX}") |
31 | d.appendVar("multilibscript_rename", "\n mv ${PKGD}" + script + " ${PKGD}" + script + "-${MULTILIB_SUFFIX}") | 31 | d.appendVar("multilibscript_rename", "\n mv ${PKGD}" + script + " ${PKGD}" + script + "-${MULTILIB_SUFFIX}") |