[OE-core] [PATCH 1/6] multilib-script: fix ALTERNATIVE_${PN} override issue

Zhixiong Chi zhixiong.chi at windriver.com
Fri Aug 10 07:31:34 UTC 2018


If multilib scripts are more than one file, the variable
ALTERNATIVE_${PN} will be overrode. Finally, there will be only
one symbol link file.

Signed-off-by: Zhixiong Chi <zhixiong.chi at windriver.com>
---
 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 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}")
-- 
2.17.1



More information about the Openembedded-core mailing list