[oe-commits] [openembedded-core] branch jethro updated: base: check for existing prefix when expanding names in PACKAGECONFIG

[git at git.openembedded.org]

rpurdie pushed a commit to branch jethro
in repository openembedded-core.

The following commit(s) were added to refs/heads/jethro by this push:
       new  9e7d207   base: check for existing prefix when expanding names in PACKAGECONFIG
9e7d207 is described below

commit 9e7d207e207bf0319b09d403d87d37f24e3dfbee
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Fri Mar 11 20:54:00 2016 +0000

    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.
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 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 9bd5499..38b69db 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -363,7 +363,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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.