From f474a7ed02acaffe5d0fcc67e06dde17fc8e4d0e Mon Sep 17 00:00:00 2001 From: Zhixiong Chi Date: Fri, 10 Aug 2018 00:31:34 -0700 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/multilib_script.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta') 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}") -- cgit 1.2.3-korg