summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-03-11 20:54:00 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-05-09 07:11:33 (GMT)
commit4a9e57795e8debcb13faefe702a542d4be6cfba1 (patch)
tree5e0480d9caecd5d3413acec2ad93851ed8021edc
parentad7ea213b25bf62f02c38505ce774905bf0502e1 (diff)
downloadpoky-4a9e57795e8debcb13faefe702a542d4be6cfba1.tar.gz
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) (From OE-Core rev: af32a5d84e9aa300095ffb7d4626708e2f85e7a2) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 () {
351 newappends.append(a) 351 newappends.append(a)
352 elif a.startswith("virtual/"): 352 elif a.startswith("virtual/"):
353 subs = a.split("/", 1)[1] 353 subs = a.split("/", 1)[1]
354 newappends.append("virtual/" + prefix + subs + extension) 354 if subs.startswith(prefix):
355 newappends.append(a + extension)
356 else:
357 newappends.append("virtual/" + prefix + subs + extension)
355 else: 358 else:
356 if a.startswith(prefix): 359 if a.startswith(prefix):
357 newappends.append(a + extension) 360 newappends.append(a + extension)