summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-03-11 20:54:00 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-11 23:15:01 +0000
commit1a51bb69b7600cbe6da7928d46e0ea058a14ccde (patch)
treef29baaf3a85356d2897903e1e5274f0eec37f5d1
parentc484129d7b8922521c32d5602e93f031e0162372 (diff)
downloadpoky-1a51bb69b7600cbe6da7928d46e0ea058a14ccde.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 rev: 9e7d207e207bf0319b09d403d87d37f24e3dfbee) Signed-off-by: Ross Burton <ross.burton@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 9bd5499a10..38b69db624 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -363,7 +363,10 @@ python () {
363 newappends.append(a) 363 newappends.append(a)
364 elif a.startswith("virtual/"): 364 elif a.startswith("virtual/"):
365 subs = a.split("/", 1)[1] 365 subs = a.split("/", 1)[1]
366 newappends.append("virtual/" + prefix + subs + extension) 366 if subs.startswith(prefix):
367 newappends.append(a + extension)
368 else:
369 newappends.append("virtual/" + prefix + subs + extension)
367 else: 370 else:
368 if a.startswith(prefix): 371 if a.startswith(prefix):
369 newappends.append(a + extension) 372 newappends.append(a + extension)