summaryrefslogtreecommitdiffstats
path: root/meta
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:43:51 +0100
commita7afc0468f1f6df35c485acc11f6b20a94057ef5 (patch)
tree419a166bdcfa89fd0a440d4c824c6b0d146e0748 /meta
parented3321d229a6e802052d2b802a721dbd9101e990 (diff)
downloadpoky-a7afc0468f1f6df35c485acc11f6b20a94057ef5.tar.gz
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. (From OE-Core rev: b4cf6631efd526728ac515ced1a7e578674ca6c1) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 () {
18 if val: 18 if val:
19 e.data.setVar(name + "_MULTILIB_ORIGINAL", val) 19 e.data.setVar(name + "_MULTILIB_ORIGINAL", val)
20 20
21 overrides = e.data.getVar("OVERRIDES", False)
22 pn = e.data.getVar("PN", False)
23 overrides = overrides.replace("pn-${PN}", "pn-${PN}:pn-" + pn)
24 e.data.setVar("OVERRIDES", overrides)
25
21 if bb.data.inherits_class('image', e.data): 26 if bb.data.inherits_class('image', e.data):
22 e.data.setVar("MLPREFIX", variant + "-") 27 e.data.setVar("MLPREFIX", variant + "-")
23 e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False)) 28 e.data.setVar("PN", variant + "-" + e.data.getVar("PN", False))