base: Fixup PACKAGECONFIG incorrect mappings

PATCH New Richard Purdie 1 participant 1 message Apr 1, 2016

lore

Share & tools

lore

Richard Purdie

author

2016-04-01 17:02 UTC #0 lore raw

PATCH 1/1 base: Fixup PACKAGECONFIG incorrect mappings

PACKAGECONFIG doesn't work in cross-canadian recipes at the moment as DEPENDS are prepended with mlprefix.

A recipe is either nativesdk, native or target so adjust the if statements accordingly, use inherits_class for more accurate recipe classification and add cross-canadian support.

Signed-off-by Richard Purdie <[email protected]>

meta/classes/base.bbclass +3 -3

index 85d6bc4..02429dd 100644
@@ -398,11 +398,11 @@ python () {
             if not appends:
                 return
             if varname.find("DEPENDS") != -1:
-                if pn.startswith("nativesdk-"):
+                if bb.data.inherits_class('nativesdk', d) or bb.data.inherits_class('cross-canadian', d) :
                     appends = expandFilter(appends, "", "nativesdk-")
-                if pn.endswith("-native"):
+                elif bb.data.inherits_class('native', d):
                     appends = expandFilter(appends, "-native", "")
-                if mlprefix:
+                elif mlprefix:
                     appends = expandFilter(appends, "", mlprefix)
             varname = d.expand(varname)
             d.appendVar(varname, " " + " ".join(appends))