multilib: Tweak value of PN used for OVERRIDES

PATCH New Richard Purdie 1 participant 1 message May 2, 2015

Share & tools

Richard Purdie

author

2015-05-02 09:04 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

meta/classes/multilib.bbclass +5 -0

index eea2fd5..2b5d356 100644
@@ -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))