Patchwork [1/1] insane.bbclass: maybe no log.do_compile or log.do_install

login
register
mail settings
Submitter Robert Yang
Date March 22, 2012, 9:55 a.m.
Message ID <253fa78b8753e139210403c0a7e8d5361b004f15.1332409894.git.liezhi.yang@windriver.com>
Download mbox | patch
Permalink /patch/24109/
State Accepted
Commit bbf38aa898454a2bb9a4ac993eb2696fbd5f4e57
Headers show

Comments

Robert Yang - March 22, 2012, 9:55 a.m.
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]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/classes/insane.bbclass |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)

Patch

diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 6298136..fbeb97a 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)