From 50edd6dd2fa86d9a51cc54ecdaa1599a1efc5a43 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 30 Jul 2015 01:41:08 -0700 Subject: base.bbclass/blacklist.bbclass: remove doc item when d.getVarFlags() The FOO[doc] is set in meta/conf/documentation.conf, we need remove it from d.getVarFlags()'s return dict when it causes many loops. Signed-off-by: Robert Yang --- meta/classes/base.bbclass | 2 ++ meta/classes/blacklist.bbclass | 2 ++ 2 files changed, 4 insertions(+) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index b7e22ad0db..9e33f44476 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -336,6 +336,8 @@ python () { # PACKAGECONFIG ??= "" # 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 a0141a82c0..39b3f828c6 100644 --- a/meta/classes/blacklist.bbclass +++ b/meta/classes/blacklist.bbclass @@ -28,6 +28,8 @@ 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 -- cgit 1.2.3-korg