summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-08-11 15:30:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-11 09:28:52 -0700
commit161180b8f44196a9fb863a979e9fb2256b5eb6fa (patch)
tree5b86a260f0a72e1fe4cdfc5b9e80aa2cd2c8e06c /meta/classes
parentd6d7494542b2c747bba98f3fd09cb404ac2f0563 (diff)
downloadpoky-161180b8f44196a9fb863a979e9fb2256b5eb6fa.tar.gz
Revert "base.bbclass/blacklist.bbclass: remove doc item when d.getVarFlags()"
This deletes and therefore breaks PACKAGECONFIG[doc], so revert. This reverts commit b741780d43ad412f6a1ae91d8489ec3522447ea2. (From OE-Core rev: 45cff248f5f9f4fb2498c34963e6652cc1166737) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/base.bbclass2
-rw-r--r--meta/classes/blacklist.bbclass2
2 files changed, 0 insertions, 4 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 10cb10b83b..f0780011bd 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -349,8 +349,6 @@ python () {
349 # PACKAGECONFIG ??= "<default options>" 349 # PACKAGECONFIG ??= "<default options>"
350 # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends" 350 # PACKAGECONFIG[foo] = "--enable-foo,--disable-foo,foo_depends,foo_runtime_depends"
351 pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {} 351 pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {}
352 # Remove PACKAGECONFIG[doc]
353 pkgconfigflags.pop('doc', None)
354 if pkgconfigflags: 352 if pkgconfigflags:
355 pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split() 353 pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split()
356 pn = d.getVar("PN", True) 354 pn = d.getVar("PN", True)
diff --git a/meta/classes/blacklist.bbclass b/meta/classes/blacklist.bbclass
index 39b3f828c6..a0141a82c0 100644
--- a/meta/classes/blacklist.bbclass
+++ b/meta/classes/blacklist.bbclass
@@ -28,8 +28,6 @@ python blacklist_multilib_eventhandler() {
28 prefixes.append(eext[1]) 28 prefixes.append(eext[1])
29 29
30 blacklists = e.data.getVarFlags('PNBLACKLIST') or {} 30 blacklists = e.data.getVarFlags('PNBLACKLIST') or {}
31 # Remove PNBLACKLIST[doc]
32 blacklists.pop('doc', None)
33 for pkg, reason in blacklists.items(): 31 for pkg, reason in blacklists.items():
34 if pkg.endswith(("-native", "-crosssdk")) or pkg.startswith(("nativesdk-", "virtual/nativesdk-")) or 'cross-canadian' in pkg: 32 if pkg.endswith(("-native", "-crosssdk")) or pkg.startswith(("nativesdk-", "virtual/nativesdk-")) or 'cross-canadian' in pkg:
35 continue 33 continue