summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/multilib_global.bbclass5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
index ed34404117..612cfb6919 100644
--- a/meta/classes/multilib_global.bbclass
+++ b/meta/classes/multilib_global.bbclass
@@ -30,7 +30,10 @@ def preferred_ml_updates(d):
30 override = ":virtclass-multilib-" + p 30 override = ":virtclass-multilib-" + p
31 localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override) 31 localdata.setVar("OVERRIDES", localdata.getVar("OVERRIDES", False) + override)
32 bb.data.update_data(localdata) 32 bb.data.update_data(localdata)
33 newname = localdata.expand(v).replace("PREFERRED_VERSION_", "PREFERRED_VERSION_" + p + '-') 33 if "-canadian-" in pkg:
34 newname = localdata.expand(v)
35 else:
36 newname = localdata.expand(v).replace("PREFERRED_VERSION_", "PREFERRED_VERSION_" + p + '-')
34 if newname != v: 37 if newname != v:
35 newval = localdata.expand(val) 38 newval = localdata.expand(val)
36 d.setVar(newname, newval) 39 d.setVar(newname, newval)