summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-12-01 09:01:28 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-09 08:47:27 +0000
commit55ca1fb8f0e81ff739b3c46897e43356d1f760c3 (patch)
treeab90f05ccdc9ce0088a8840cc69de809ff9087e9
parent04b22b6b4953360ea383c4d928dea66f7b1796e6 (diff)
downloadopenembedded-core-contrib-55ca1fb8f0e81ff739b3c46897e43356d1f760c3.tar.gz
openembedded-core-contrib-55ca1fb8f0e81ff739b3c46897e43356d1f760c3.tar.bz2
openembedded-core-contrib-55ca1fb8f0e81ff739b3c46897e43356d1f760c3.zip
base: check for existing prefix when expanding names in PACKAGECONFIG
When the DEPENDS are added as part of the PACKAGECONFIG logic the list of packages are expanded so that any required nativesdk-/-native/multilib prefixes and suffixes are added. However the special handling of virtual/foo names doesn't check that the prefix already exists, which breaks under nativesdk as in that situation there's an explicit nativesdk- prefix *and* MLPREFIX is set to nativesdk-. This results in the same prefix being applied twice, and virtual packages such as virtual/libx11 ending up as virtual/nativesdk-nativesdk-libx11. Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/base.bbclass5
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 0d92948972..f856298fb5 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -381,7 +381,10 @@ python () {
newappends.append(a)
elif a.startswith("virtual/"):
subs = a.split("/", 1)[1]
- newappends.append("virtual/" + prefix + subs + extension)
+ if subs.startswith(prefix):
+ newappends.append(a + extension)
+ else:
+ newappends.append("virtual/" + prefix + subs + extension)
else:
if a.startswith(prefix):
newappends.append(a + extension)