summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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