aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2015-03-16 17:19:17 +0800
committerChen Qi <Qi.Chen@windriver.com>2015-03-19 13:15:22 +0800
commitf6e1340fbf6bcb06b633b3e3d75266bf5c920c1c (patch)
treefec644063f737fd958afdc1fdbf830731fd7aee5
parent0752c79282b1cc9699743e719518e6c341d50a3a (diff)
downloadopenembedded-core-contrib-f6e1340fbf6bcb06b633b3e3d75266bf5c920c1c.tar.gz
openembedded-core-contrib-f6e1340fbf6bcb06b633b3e3d75266bf5c920c1c.tar.bz2
openembedded-core-contrib-f6e1340fbf6bcb06b633b3e3d75266bf5c920c1c.zip
rootfs.py: two changes regarding log checking
This patch involves two changes. 1. Extend the regular expression to also catch '^WARNING:' in _log_check_warn. Warnings from bb.note or bbnote begin with 'WARNING:'. So if we decide to catch warnings at rootfs time, we should not ignore those produced by the build system itself. 2. Delay _log_check in rootfs process so that more warnings are likely to be catched. Note that we should at least delay the _log_check after the execution of ROOTFS_POSTPROCESS_COMMANDS, because we want to catch warnings there. Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
-rw-r--r--meta/lib/oe/rootfs.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 7e8d5d15a27..3a77e86ec12 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -128,6 +128,7 @@ class Rootfs(object):
self._generate_kernel_module_deps()
self._cleanup()
+ self._log_check()
def _uninstall_unneeded(self):
# Remove unneeded init script symlinks
@@ -327,8 +328,6 @@ class RpmRootfs(Rootfs):
self.pm.install_complementary()
- self._log_check()
-
if self.inc_rpm_image_gen == "1":
self.pm.backup_packaging_data()
@@ -355,7 +354,7 @@ class RpmRootfs(Rootfs):
pass
def _log_check_warn(self):
- r = re.compile('^(warn|Warn|NOTE: warn|NOTE: Warn)')
+ r = re.compile('^(warn|Warn|NOTE: warn|NOTE: Warn|WARNING:)')
log_path = self.d.expand("${T}/log.do_rootfs")
with open(log_path, 'r') as log:
for line in log.read().split('\n'):