From 32c49bc10013ece820c9168b690d14a5a9fd1f13 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 8 Mar 2021 18:01:49 +0000 Subject: insane: don't check for a warning string that is never output insane has checks that the compiler isn't printing "CROSS COMPILE Badness" during configure/compile/install, but this message hasn't been output by GCC since 2010 (23f522e7). The current warning is "include location [...] is unsafe for cross- compilation" and as that is a proper GCC warning, we can make it fatal in follow-up patches. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit a67e9ebfd5b8002fd4a7d8d27ff0d997817f76e1) Signed-off-by: Steve Sakoman --- meta/classes/insane.bbclass | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index b5c6b2186f..09e8fbd8e4 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -1012,26 +1012,6 @@ python do_package_qa () { logdir = d.getVar('T') pn = d.getVar('PN') - # Check the compile log for host contamination - compilelog = os.path.join(logdir,"log.do_compile") - - if os.path.exists(compilelog): - statement = "grep -e 'CROSS COMPILE Badness:' -e 'is unsafe for cross-compilation' %s > /dev/null" % compilelog - if subprocess.call(statement, shell=True) == 0: - msg = "%s: The compile log indicates that host include and/or library paths were used.\n \ - Please check the log '%s' for more information." % (pn, compilelog) - package_qa_handle_error("compile-host-path", msg, d) - - # Check the install log for host contamination - installlog = os.path.join(logdir,"log.do_install") - - if os.path.exists(installlog): - statement = "grep -e 'CROSS COMPILE Badness:' -e 'is unsafe for cross-compilation' %s > /dev/null" % installlog - if subprocess.call(statement, shell=True) == 0: - msg = "%s: The install log indicates that host include and/or library paths were used.\n \ - Please check the log '%s' for more information." % (pn, installlog) - package_qa_handle_error("install-host-path", msg, d) - # Scan the packages... pkgdest = d.getVar('PKGDEST') packages = set((d.getVar('PACKAGES') or '').split()) @@ -1210,7 +1190,7 @@ python do_qa_configure() { if bb.data.inherits_class('autotools', d) and not skip_configure_unsafe: bb.note("Checking autotools environment for common misconfiguration") for root, dirs, files in os.walk(workdir): - statement = "grep -q -F -e 'CROSS COMPILE Badness:' -e 'is unsafe for cross-compilation' %s" % \ + statement = "grep -q -F -e 'is unsafe for cross-compilation' %s" % \ os.path.join(root,"config.log") if "config.log" in files: if subprocess.call(statement, shell=True) == 0: -- cgit 1.2.3-korg