[oe-commits] Ross Burton : Revert "base.bbclass/blacklist.bbclass: remove doc item when d.getVarFlags()"
git at git.openembedded.org
git at git.openembedded.org
Tue Aug 11 16:23:27 UTC 2015
Module: openembedded-core.git
Branch: master-next
Commit: 45cff248f5f9f4fb2498c34963e6652cc1166737
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=45cff248f5f9f4fb2498c34963e6652cc1166737
Author: Ross Burton <ross.burton at intel.com>
Date: Tue Aug 11 15:30:19 2015 +0100
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 at intel.com>
---
meta/classes/base.bbclass | 2 --
meta/classes/blacklist.bbclass | 2 --
2 files changed, 4 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 10cb10b..f078001 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 39b3f82..a0141a8 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
More information about the Openembedded-commits
mailing list