aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-03-11 20:54:00 +0000
committerJoshua Lock <joshua.g.lock@intel.com>2016-05-06 15:51:14 +0100
commitaf32a5d84e9aa300095ffb7d4626708e2f85e7a2 (patch)
tree095ce6d570014b932f5db2fb4dbf67e24e2b0195
parentc1b39f145b9e9f65875ec7b46030327741267031 (diff)
downloadopenembedded-core-af32a5d84e9aa300095ffb7d4626708e2f85e7a2.zip
openembedded-core-af32a5d84e9aa300095ffb7d4626708e2f85e7a2.tar.gz
openembedded-core-af32a5d84e9aa300095ffb7d4626708e2f85e7a2.tar.bz2
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. (From OE-Core master rev: 9e7d207e207bf0319b09d403d87d37f24e3dfbee) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Joshua Lock <joshua.g.lock@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 effe12e..14a4b66 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -351,7 +351,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)