From 551cda0bd5258f83e2cc35564ee1640b760ca722 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 1 Dec 2015 09:01:28 +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 rev: 55ca1fb8f0e81ff739b3c46897e43356d1f760c3) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta/classes/base.bbclass') 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) -- cgit v1.2.3-54-g00ecf