[oe-commits] Robert Yang : base.bbclass/blacklist.bbclass: remove doc item when d.getVarFlags()
git at git.openembedded.org
git at git.openembedded.org
Sat Aug 1 21:25:11 UTC 2015
Module: openembedded-core.git
Branch: master
Commit: 595a7af8d0a52b24e2bdb5c373c64d27b54bb25b
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=595a7af8d0a52b24e2bdb5c373c64d27b54bb25b
Author: Robert Yang <liezhi.yang at windriver.com>
Date: Thu Jul 30 08:18:10 2015 -0700
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 <liezhi.yang at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
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 f078001..10cb10b 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -349,6 +349,8 @@ 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 a0141a8..39b3f82 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
More information about the Openembedded-commits
mailing list