From b4cf6631efd526728ac515ced1a7e578674ca6c1 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Sat, 2 May 2015 10:04:37 +0100 Subject: 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 --- meta/classes/multilib.bbclass | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'meta/classes/multilib.bbclass') 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)) -- cgit 1.2.3-korg