summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes-recipe/multilib_script.bbclass11
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/classes-recipe/multilib_script.bbclass b/meta/classes-recipe/multilib_script.bbclass
index 7011526254..e6f0249529 100644
--- a/meta/classes-recipe/multilib_script.bbclass
+++ b/meta/classes-recipe/multilib_script.bbclass
@@ -31,10 +31,11 @@ python () {
31 for entry in (d.getVar("MULTILIB_SCRIPTS", False) or "").split(): 31 for entry in (d.getVar("MULTILIB_SCRIPTS", False) or "").split():
32 pkg, script = entry.split(":") 32 pkg, script = entry.split(":")
33 epkg = d.expand(pkg) 33 epkg = d.expand(pkg)
34 scriptname = os.path.basename(script) 34 escript = d.expand(script)
35 scriptname = os.path.basename(escript)
35 d.appendVar("ALTERNATIVE:" + epkg, " " + scriptname + " ") 36 d.appendVar("ALTERNATIVE:" + epkg, " " + scriptname + " ")
36 d.setVarFlag("ALTERNATIVE_LINK_NAME", scriptname, script) 37 d.setVarFlag("ALTERNATIVE_LINK_NAME", scriptname, escript)
37 d.setVarFlag("ALTERNATIVE_TARGET", scriptname, script + "-${MULTILIB_SUFFIX}") 38 d.setVarFlag("ALTERNATIVE_TARGET", scriptname, escript + "-${MULTILIB_SUFFIX}")
38 d.appendVar("multilibscript_rename", "\n mv ${PKGD}" + script + " ${PKGD}" + script + "-${MULTILIB_SUFFIX}") 39 d.appendVar("multilibscript_rename", "\n mv ${PKGD}" + escript + " ${PKGD}" + escript + "-${MULTILIB_SUFFIX}")
39 d.appendVar("FILES:" + epkg, " " + script + "-${MULTILIB_SUFFIX}") 40 d.appendVar("FILES:" + epkg, " " + escript + "-${MULTILIB_SUFFIX}")
40} 41}