From 4a9e57795e8debcb13faefe702a542d4be6cfba1 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 11 Mar 2016 20:54:00 +0000 Subject: 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 Signed-off-by: Richard Purdie Signed-off-by: Joshua Lock Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index effe12eca4..14a4b66095 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) -- cgit v1.2.3-54-g00ecf