[oe-commits] Lei Liu : base.bbclass: Fix incorrect setting of multilib PREFERRED_PROVIDER_virtual_pkg
git at git.openembedded.org
git at git.openembedded.org
Fri Nov 22 14:12:25 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: 17a432dc059e24ba10d4baec988828c0025a5e46
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=17a432dc059e24ba10d4baec988828c0025a5e46
Author: Lei Liu <lei.liu2 at windriver.com>
Date: Thu Nov 21 00:54:00 2013 -0600
base.bbclass: Fix incorrect setting of multilib PREFERRED_PROVIDER_virtual_pkg
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 <lei.liu2 at windriver.com>
Signed-off-by: Robert Yang <liezhi.yang at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/base.bbclass | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 93bc700..d0793b6 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -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):
More information about the Openembedded-commits
mailing list