From: Zhixiong Chi <zhixiong.chi@windriver.com>
Date: Fri, 10 Aug 2018 07:31:34 +0000 (-0700)
Subject: multilib-script: Fix ALTERNATIVE_${PN} overwrite issue
X-Git-Tag: uninative-2.3~733
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=f474a7ed02acaffe5d0fcc67e06dde17fc8e4d0e;p=openembedded-core.git

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>
---

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}")