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>
This commit is contained in:
parent
5dc1f3d8a0
commit
f4d90ecf88
|
@ -128,6 +128,7 @@ class Rootfs(object):
|
||||||
self._generate_kernel_module_deps()
|
self._generate_kernel_module_deps()
|
||||||
|
|
||||||
self._cleanup()
|
self._cleanup()
|
||||||
|
self._log_check()
|
||||||
|
|
||||||
def _uninstall_unneeded(self):
|
def _uninstall_unneeded(self):
|
||||||
# Remove unneeded init script symlinks
|
# Remove unneeded init script symlinks
|
||||||
|
@ -327,8 +328,6 @@ class RpmRootfs(Rootfs):
|
||||||
|
|
||||||
self.pm.install_complementary()
|
self.pm.install_complementary()
|
||||||
|
|
||||||
self._log_check()
|
|
||||||
|
|
||||||
if self.inc_rpm_image_gen == "1":
|
if self.inc_rpm_image_gen == "1":
|
||||||
self.pm.backup_packaging_data()
|
self.pm.backup_packaging_data()
|
||||||
|
|
||||||
|
@ -355,7 +354,7 @@ class RpmRootfs(Rootfs):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
def _log_check_warn(self):
|
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")
|
log_path = self.d.expand("${T}/log.do_rootfs")
|
||||||
with open(log_path, 'r') as log:
|
with open(log_path, 'r') as log:
|
||||||
for line in log.read().split('\n'):
|
for line in log.read().split('\n'):
|
||||||
|
|
Loading…
Reference in New Issue