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>

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 10cb10b83b8f1b274cdb4fcf2e868fcb489225ca..f0780011bd58d4b510cd0f18a9734ecd657a8b4b 100644 (file)
--- 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 39b3f828c61cd1949a06bda4efb56d01f00543cf..a0141a82c0967736d10211a712c3fd15880782f6 100644 (file)
--- 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