[oe-commits] [openembedded-core] 14/29: multilib-script: Fix ALTERNATIVE_${PN} overwrite issue

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master
in repository openembedded-core.

commit f474a7ed02acaffe5d0fcc67e06dde17fc8e4d0e
Author: Zhixiong Chi <zhixiong.chi at windriver.com>
AuthorDate: Fri Aug 10 00:31:34 2018 -0700

    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 at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/multilib_script.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/classes/multilib_script.bbclass b/meta/classes/multilib_script.bbclass
index a5a552b..51c9fcc 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}")

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.