diff options
Diffstat (limited to 'poky/meta/classes-global')
-rw-r--r-- | poky/meta/classes-global/insane.bbclass | 14 | ||||
-rw-r--r-- | poky/meta/classes-global/license.bbclass | 2 | ||||
-rw-r--r-- | poky/meta/classes-global/staging.bbclass | 4 |
3 files changed, 6 insertions, 14 deletions
diff --git a/poky/meta/classes-global/insane.bbclass b/poky/meta/classes-global/insane.bbclass index ee34d5208d..8788f58fc5 100644 --- a/poky/meta/classes-global/insane.bbclass +++ b/poky/meta/classes-global/insane.bbclass @@ -617,22 +617,14 @@ def check_32bit_symbols(path, packagename, d, elf, messages): # At this point, any symbol information is stripped into the debug # package, so that is the only place we will find them. elfpath = elfpath.replace('.debug/', '') - allowed = ( - d.getVarFlag( - 'INSANE_SKIP:' + d.getVar('PN'), elfpath.replace('/', '_') - ) or '' - ).split() - usedapis -= set(allowed) - if usedapis: + allowed = "32bit-time" in (d.getVar('INSANE_SKIP') or '').split() + if not allowed: msgformat = elfpath + " uses 32-bit api '%s'" for sym in usedapis: oe.qa.add_message(messages, '32bit-time', msgformat % sym) oe.qa.add_message( messages, '32bit-time', - 'Suppress with INSANE_SKIP:%s[%s] = "%s"' % ( - d.getVar('PN'), elfpath.replace('/', '_'), - ' '.join(usedapis) - ) + 'Suppress with INSANE_SKIP = "32bit-time"' ) # Check license variables diff --git a/poky/meta/classes-global/license.bbclass b/poky/meta/classes-global/license.bbclass index 560acb8b6f..23625f0104 100644 --- a/poky/meta/classes-global/license.bbclass +++ b/poky/meta/classes-global/license.bbclass @@ -229,7 +229,7 @@ def find_license_files(d): bb.fatal('%s: %s' % (d.getVar('PF'), exc)) except SyntaxError: oe.qa.handle_error("license-syntax", - "%s: Failed to parse it's LICENSE field." % (d.getVar('PF')), d) + "%s: Failed to parse LICENSE: %s" % (d.getVar('PF'), d.getVar('LICENSE')), d) # Add files from LIC_FILES_CHKSUM to list of license files lic_chksum_paths = defaultdict(OrderedDict) for path, data in sorted(lic_chksums.items()): diff --git a/poky/meta/classes-global/staging.bbclass b/poky/meta/classes-global/staging.bbclass index a058d344fd..6eefba4d73 100644 --- a/poky/meta/classes-global/staging.bbclass +++ b/poky/meta/classes-global/staging.bbclass @@ -125,8 +125,8 @@ do_populate_sysroot[vardeps] += "${SYSROOT_PREPROCESS_FUNCS}" do_populate_sysroot[vardepsexclude] += "BB_MULTI_PROVIDER_ALLOWED" POPULATESYSROOTDEPS = "" -POPULATESYSROOTDEPS:class-target = "virtual/${MLPREFIX}${HOST_PREFIX}binutils:do_populate_sysroot" -POPULATESYSROOTDEPS:class-nativesdk = "virtual/${HOST_PREFIX}binutils-crosssdk:do_populate_sysroot" +POPULATESYSROOTDEPS:class-target = "virtual/${HOST_PREFIX}binutils:do_populate_sysroot" +POPULATESYSROOTDEPS:class-nativesdk = "virtual/${HOST_PREFIX}binutils:do_populate_sysroot" do_populate_sysroot[depends] += "${POPULATESYSROOTDEPS}" SSTATETASKS += "do_populate_sysroot" |