Skip to contentSkip to conversation

insane.bbclass: maybe no log.do_compile or log.do_install

PATCH Applied Robert Yang 2 participants 3 messages Mar 22, 2012

lore
Share & tools
lore
#0 lore raw

cover insane.bbclass: maybe no log.do_compile or log.do_install

The following changes since commit 047ce547edd61b0d3b15c22b3492f7595ce2bc66:

xserver-kdrive: Fix packaging warnings (2012-03-21 23:17:32 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib robert/insane
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/insane

Robert Yang (1):
insane.bbclass: maybe no log.do_compile or log.do_install

 meta/classes/insane.bbclass |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)
#1 lore raw

PATCH 1/1 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]

---
 meta/classes/insane.bbclass |   19 ++++++++++---------
 1 files changed, 10 insertions(+), 9 deletions(-)
meta/classes/insane.bbclass +10 -9
index 6298136..fbeb97a 100644
@@ -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)
Signature · 1 line
1.7.1
Applied
#2 lore raw
In reply to Robert Yang
Quoted 8 lines · Robert Yang

The following changes since commit 047ce547edd61b0d3b15c22b3492f7595ce2bc66:

   xserver-kdrive: Fix packaging warnings (2012-03-21 23:17:32 +0000)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib robert/insane
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/insane

Quoted 7 lines

Robert Yang (1):
insane.bbclass: maybe no log.do_compile or log.do_install

  meta/classes/insane.bbclass |   19 ++++++++++---------
  1 files changed, 10 insertions(+), 9 deletions(-)

Merged into OE-Core

Thanks
Sau!

Quoted 5 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core