diff options
Diffstat (limited to 'poky/meta/classes-recipe/multilib_script.bbclass')
-rw-r--r-- | poky/meta/classes-recipe/multilib_script.bbclass | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/poky/meta/classes-recipe/multilib_script.bbclass b/poky/meta/classes-recipe/multilib_script.bbclass index e6f0249529..a7a08930b7 100644 --- a/poky/meta/classes-recipe/multilib_script.bbclass +++ b/poky/meta/classes-recipe/multilib_script.bbclass @@ -28,14 +28,12 @@ python () { if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d): return - for entry in (d.getVar("MULTILIB_SCRIPTS", False) or "").split(): - pkg, script = entry.split(":") - epkg = d.expand(pkg) - escript = d.expand(script) - scriptname = os.path.basename(escript) - d.appendVar("ALTERNATIVE:" + epkg, " " + scriptname + " ") - d.setVarFlag("ALTERNATIVE_LINK_NAME", scriptname, escript) - d.setVarFlag("ALTERNATIVE_TARGET", scriptname, escript + "-${MULTILIB_SUFFIX}") - d.appendVar("multilibscript_rename", "\n mv ${PKGD}" + escript + " ${PKGD}" + escript + "-${MULTILIB_SUFFIX}") - d.appendVar("FILES:" + epkg, " " + escript + "-${MULTILIB_SUFFIX}") + for entry in (d.getVar("MULTILIB_SCRIPTS") or "").split(): + pkg, script = entry.split(":", 1) + scriptname = os.path.basename(script) + 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}") + d.appendVar("FILES:" + pkg, " " + script + "-${MULTILIB_SUFFIX}") } |