summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-01 18:02:07 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-03 15:51:35 +0100
commit370a50a27be5ff2aefdd9e306dde6a4b89bcdcda (patch)
tree81c4f8cf8093bcfd73b1ac547cfe7cbbd8ad9c62
parentdea34232b8bec19489933b8d02df3aa0b543e148 (diff)
downloadpoky-370a50a27be5ff2aefdd9e306dde6a4b89bcdcda.tar.gz
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. (From OE-Core rev: 4a172868a9423afb8a602413ef4935423ce51a5d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/base.bbclass6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 67b33706f4..f9697a9ad8 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -398,11 +398,11 @@ python () {
398 if not appends: 398 if not appends:
399 return 399 return
400 if varname.find("DEPENDS") != -1: 400 if varname.find("DEPENDS") != -1:
401 if pn.startswith("nativesdk-"): 401 if bb.data.inherits_class('nativesdk', d) or bb.data.inherits_class('cross-canadian', d) :
402 appends = expandFilter(appends, "", "nativesdk-") 402 appends = expandFilter(appends, "", "nativesdk-")
403 if pn.endswith("-native"): 403 elif bb.data.inherits_class('native', d):
404 appends = expandFilter(appends, "-native", "") 404 appends = expandFilter(appends, "-native", "")
405 if mlprefix: 405 elif mlprefix:
406 appends = expandFilter(appends, "", mlprefix) 406 appends = expandFilter(appends, "", mlprefix)
407 varname = d.expand(varname) 407 varname = d.expand(varname)
408 d.appendVar(varname, " " + " ".join(appends)) 408 d.appendVar(varname, " " + " ".join(appends))