aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-08-11 15:30:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-11 09:22:51 -0700
commit45cff248f5f9f4fb2498c34963e6652cc1166737 (patch)
treefafd4365342c249b101ab10076829416ab42b2d1
parent029cf9c83c91b8430375bec1bb241430174bd5d8 (diff)
downloadopenembedded-core-contrib-45cff248f5f9f4fb2498c34963e6652cc1166737.tar.gz
openembedded-core-contrib-45cff248f5f9f4fb2498c34963e6652cc1166737.tar.bz2
openembedded-core-contrib-45cff248f5f9f4fb2498c34963e6652cc1166737.zip
Revert "base.bbclass/blacklist.bbclass: remove doc item when d.getVarFlags()"
This deletes and therefore breaks PACKAGECONFIG[doc], so revert. This reverts commit b741780d43ad412f6a1ae91d8489ec3522447ea2. Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/classes/base.bbclass2
-rw-r--r--meta/classes/blacklist.bbclass2
2 files changed, 0 insertions, 4 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 10cb10b83b8..f0780011bd5 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 39b3f828c61..a0141a82c09 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