diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-01 18:02:07 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-03 15:51:08 +0100 |
| commit | 4a172868a9423afb8a602413ef4935423ce51a5d (patch) | |
| tree | 8963549a44630a155972b3912460ab7706ac468e | |
| parent | f092f99a0d7116ba4347b22f3f81b4eac4808e62 (diff) | |
| download | openembedded-core-4a172868a9423afb8a602413ef4935423ce51a5d.tar.gz openembedded-core-4a172868a9423afb8a602413ef4935423ce51a5d.tar.bz2 openembedded-core-4a172868a9423afb8a602413ef4935423ce51a5d.zip | |
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 <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/base.bbclass | 6 |
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 () { 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)) |