diff options
author | Ross Burton <ross.burton@intel.com> | 2015-08-11 15:30:19 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-11 09:28:52 -0700 |
commit | 161180b8f44196a9fb863a979e9fb2256b5eb6fa (patch) | |
tree | 5b86a260f0a72e1fe4cdfc5b9e80aa2cd2c8e06c | |
parent | d6d7494542b2c747bba98f3fd09cb404ac2f0563 (diff) | |
download | openembedded-core-contrib-161180b8f44196a9fb863a979e9fb2256b5eb6fa.tar.gz |
Revert "base.bbclass/blacklist.bbclass: remove doc item when d.getVarFlags()"
This deletes and therefore breaks PACKAGECONFIG[doc], so revert.
This reverts commit b741780d43ad412f6a1ae91d8489ec3522447ea2.
(From OE-Core rev: 45cff248f5f9f4fb2498c34963e6652cc1166737)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/base.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/blacklist.bbclass | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 10cb10b83b..f0780011bd 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -349,8 +349,6 @@ python () { # PACKAGECONFIG ??= "<default options>" # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends" pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} - # Remove PACKAGECONFIG[doc] - pkgconfigflags.pop('doc', None) if pkgconfigflags: pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split() pn = d.getVar("PN", True) diff --git a/meta/classes/blacklist.bbclass b/meta/classes/blacklist.bbclass index 39b3f828c6..a0141a82c0 100644 --- a/meta/classes/blacklist.bbclass +++ b/meta/classes/blacklist.bbclass @@ -28,8 +28,6 @@ python blacklist_multilib_eventhandler() { prefixes.append(eext[1]) blacklists = e.data.getVarFlags('PNBLACKLIST') or {} - # Remove PNBLACKLIST[doc] - blacklists.pop('doc', None) for pkg, reason in blacklists.items(): if pkg.endswith(("-native", "-crosssdk")) or pkg.startswith(("nativesdk-", "virtual/nativesdk-")) or 'cross-canadian' in pkg: continue |