From 4a172868a9423afb8a602413ef4935423ce51a5d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 1 Apr 2016 18:02:07 +0100 Subject: 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 --- meta/classes/base.bbclass | 6 +++--- 1 file 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 () { 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)) -- cgit 1.2.3-korg