base.bbclass: Fix incorrect setting of multilib PREFERRED_PROVIDER_virtual_pkg
PATCH 1/1 base.bbclass: Fix incorrect setting of multilib PREFERRED_PROVIDER_virtual_pkg
From: Lei Liu <[email protected]>
PREFERRED_PROVIDER_virtual_pkg has been incorrectly set with more than one multilib prefixes. For example, if we have two alternative multilibs lib64 and lib32, PREFERRED_PROVIDER_virtual_pkg will be set to lib32-lib64-pkg or lib64-lib32-pkg, depending on which multilib shows up first in the list.
Signed-off-by Lei Liu <[email protected]>
Signed-off-by Robert Yang <[email protected]>
--- meta/classes/base.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta/classes/base.bbclass +3 -3
@@ -210,7 +210,7 @@ def preferred_ml_updates(d): virt = "virtual/" for p in prefixes: if pkg != "kernel": - val = p + "-" + val + newval = p + "-" + val # implement variable keys localdata = bb.data.createCopy(d)
@@ -219,12 +219,12 @@ def preferred_ml_updates(d): bb.data.update_data(localdata) newname = localdata.expand(prov) if newname != prov and not d.getVar(newname, False): - d.setVar(newname, localdata.expand(val)) + d.setVar(newname, localdata.expand(newval)) # implement alternative multilib name newname = localdata.expand("PREFERRED_PROVIDER_" + virt + p + "-" + pkg) if not d.getVar(newname, False): - d.setVar(newname, val) + d.setVar(newname, newval) # Avoid future variable key expansion provexp = d.expand(prov) if prov != provexp and d.getVar(prov, False):
Signature · 1 line
1.8.1.2.545.g2f19ada