From 54d61ed9f759a38f7309f4428e1853249071667c Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 22 Mar 2012 17:55:34 +0800 Subject: insane.bbclass: maybe no log.do_compile or log.do_install The insane.bbclass grep in log.do_compile and log.do_install unconditionally, but there maybe no such logs when mirror the pkg from sstate cache file. We should check whether the log file exists or not before grep in it. Additionally, break the one too long line into two (Add a "\n"). [YOCTO #2153] (From OE-Core rev: bbf38aa898454a2bb9a4ac993eb2696fbd5f4e57) Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/classes/insane.bbclass | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'meta/classes/insane.bbclass') diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 6298136c39..fbeb97adce 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -612,19 +612,20 @@ python do_package_qa () { # Check the compile log for host contamination compilelog = os.path.join(logdir,"log.do_compile") - statement = "grep -e 'CROSS COMPILE Badness:' -e 'is unsafe for cross-compilation' %s > /dev/null" % compilelog - if os.system(statement) == 0: - bb.warn("%s: The compile log indicates that host include and/or library paths were used. Please check the log '%s' for more information." % \ - (pkg, compilelog)) - + if os.path.exists(compilelog): + statement = "grep -e 'CROSS COMPILE Badness:' -e 'is unsafe for cross-compilation' %s > /dev/null" % compilelog + if os.system(statement) == 0: + bb.warn("%s: The compile log indicates that host include and/or library paths were used.\n \ + Please check the log '%s' for more information." % (pkg, compilelog)) # Check the install log for host contamination installlog = os.path.join(logdir,"log.do_install") - statement = "grep -e 'CROSS COMPILE Badness:' -e 'is unsafe for cross-compilation' %s > /dev/null" % installlog - if os.system(statement) == 0: - bb.warn("%s: The install log indicates that host include and/or library paths were used. Please check the log '%s' for more information." % \ - (pkg, installlog)) + if os.path.exists(installlog): + statement = "grep -e 'CROSS COMPILE Badness:' -e 'is unsafe for cross-compilation' %s > /dev/null" % installlog + if os.system(statement) == 0: + bb.warn("%s: The install log indicates that host include and/or library paths were used.\n \ + Please check the log '%s' for more information." % (pkg, installlog)) # Scan the packages... pkgdest = d.getVar('PKGDEST', True) -- cgit v1.2.3-54-g00ecf