summaryrefslogtreecommitdiffstats
path: root/meta/classes/multilib.bbclass
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-02 10:04:37 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-05-03 11:39:48 +0100
commitb4cf6631efd526728ac515ced1a7e578674ca6c1 (patch)
tree6a62462ac3db41af69781ab159a848e779977b63 /meta/classes/multilib.bbclass
parent51aaa647b203d0f7ddd2f53f7191c4d2918b09b8 (diff)
downloadopenembedded-core-b4cf6631efd526728ac515ced1a7e578674ca6c1.tar.gz
openembedded-core-b4cf6631efd526728ac515ced1a7e578674ca6c1.tar.bz2
openembedded-core-b4cf6631efd526728ac515ced1a7e578674ca6c1.zip
multilib: Tweak value of PN used for OVERRIDES
Currently, PN is used in overrides which is expanded to have a MLPREFIX. This means and pn- overrides without the prefix would be ignored which is not what is usually expected. We noticed huge problems using poky-lsb with multilib since the per recipe overrides were not applied. This adds in handling for PN with and without the prefix. This should unbreak world-lsb builds on the autobuilder. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/multilib.bbclass')
-rw-r--r--meta/classes/multilib.bbclass5
1 files changed, 5 insertions, 0 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
index eea2fd59a1..2b5d356e43 100644
--- a/meta/classes/multilib.bbclass
+++ b/meta/classes/multilib.bbclass
@@ -18,6 +18,11 @@ python multilib_virtclass_handler () {
if val:
e.data.setVar(name + "_MULTILIB_ORIGINAL", val)
+ overrides = e.data.getVar("OVERRIDES", False)
+ pn = e.data.getVar("PN", False)
+ overrides = overrides.replace("pn-${PN}", "pn-${PN}:pn-" + pn)
+ e.data.setVar("OVERRIDES", overrides)
+
if bb.data.inherits_class('image', e.data):
e.data.setVar("MLPREFIX", variant + "-")
e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))