summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2015-07-30 08:18:10 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-01 10:52:37 +0100
commit595a7af8d0a52b24e2bdb5c373c64d27b54bb25b (patch)
tree9b374570caeb59ce18e08928727875b1e6dcf973
parent0a64dfcdb9f5a37771f881895be230392c4d0aff (diff)
downloadopenembedded-core-contrib-595a7af8d0a52b24e2bdb5c373c64d27b54bb25b.tar.gz
openembedded-core-contrib-595a7af8d0a52b24e2bdb5c373c64d27b54bb25b.tar.bz2
openembedded-core-contrib-595a7af8d0a52b24e2bdb5c373c64d27b54bb25b.zip
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@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/base.bbclass2
-rw-r--r--meta/classes/blacklist.bbclass2
2 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index f0780011bd..10cb10b83b 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 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