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:22 +0100 |
| commit | f474a7ed02acaffe5d0fcc67e06dde17fc8e4d0e (patch) | |
| tree | 9f14ee12c6450b20c6759045d2aa91ac834b10a7 | |
| parent | b159cb615feb7f27f8d2afc71f547742bb19cde0 (diff) | |
| download | openembedded-core-f474a7ed02acaffe5d0fcc67e06dde17fc8e4d0e.tar.gz openembedded-core-f474a7ed02acaffe5d0fcc67e06dde17fc8e4d0e.tar.bz2 openembedded-core-f474a7ed02acaffe5d0fcc67e06dde17fc8e4d0e.zip | |
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.
Signed-off-by: Zhixiong Chi <zhixiong.chi@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -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 () { for entry in (d.getVar("MULTILIB_SCRIPTS", False) or "").split(): pkg, script = entry.split(":") scriptname = os.path.basename(script) - d.setVar("ALTERNATIVE_" + pkg, scriptname) + d.appendVar("ALTERNATIVE_" + pkg, scriptname + " ") d.setVarFlag("ALTERNATIVE_LINK_NAME", scriptname, script) d.setVarFlag("ALTERNATIVE_TARGET", scriptname, script + "-${MULTILIB_SUFFIX}") d.appendVar("multilibscript_rename", "\n mv ${PKGD}" + script + " ${PKGD}" + script + "-${MULTILIB_SUFFIX}") |