[oe-commits] [openembedded-core] branch master-next updated: base: Fixup PACKAGECONFIG incorrect mappings
git at git.openembedded.org
git at git.openembedded.org
Sat Apr 2 16:49:06 UTC 2016
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
The following commit(s) were added to refs/heads/master-next by this push:
new 9c2bd86 base: Fixup PACKAGECONFIG incorrect mappings
9c2bd86 is described below
commit 9c2bd864db36c4112fb74556ac8e642b8558235f
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
AuthorDate: Fri Apr 1 18:02:07 2016 +0100
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 at linuxfoundation.org>
---
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 67b3370..f9697a9 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))
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list