summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/rootfs.py
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2015-03-19 13:17:51 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-22 14:42:15 +0000
commitf4d90ecf88a0f8b1a4b15665bb4a614dae7b5da1 (patch)
tree9c3fea7f4c735310fe50e7d5379e069659c818de /meta/lib/oe/rootfs.py
parent5dc1f3d8a0b7394398f9a090890e6af41a5e39dc (diff)
downloadpoky-f4d90ecf88a0f8b1a4b15665bb4a614dae7b5da1.tar.gz
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. (From OE-Core rev: 4c9213dffb71510ba99a0665f620e9de4a2dfeb5) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/rootfs.py')
-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 a18472aeeb..7e06d5635f 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -128,6 +128,7 @@ class Rootfs(object):
128 self._generate_kernel_module_deps() 128 self._generate_kernel_module_deps()
129 129
130 self._cleanup() 130 self._cleanup()
131 self._log_check()
131 132
132 def _uninstall_unneeded(self): 133 def _uninstall_unneeded(self):
133 # Remove unneeded init script symlinks 134 # Remove unneeded init script symlinks
@@ -327,8 +328,6 @@ class RpmRootfs(Rootfs):
327 328
328 self.pm.install_complementary() 329 self.pm.install_complementary()
329 330
330 self._log_check()
331
332 if self.inc_rpm_image_gen == "1": 331 if self.inc_rpm_image_gen == "1":
333 self.pm.backup_packaging_data() 332 self.pm.backup_packaging_data()
334 333
@@ -355,7 +354,7 @@ class RpmRootfs(Rootfs):
355 pass 354 pass
356 355
357 def _log_check_warn(self): 356 def _log_check_warn(self):
358 r = re.compile('^(warn|Warn|NOTE: warn|NOTE: Warn)') 357 r = re.compile('^(warn|Warn|NOTE: warn|NOTE: Warn|WARNING:)')
359 log_path = self.d.expand("${T}/log.do_rootfs") 358 log_path = self.d.expand("${T}/log.do_rootfs")
360 with open(log_path, 'r') as log: 359 with open(log_path, 'r') as log:
361 for line in log.read().split('\n'): 360 for line in log.read().split('\n'):