diff options
author | Konrad Weihmann <kweihmann@outlook.com> | 2020-10-16 21:46:23 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-10-20 11:11:46 +0100 |
commit | 7048d3d1f0df13afad8fcc1216ce159d8198a978 (patch) | |
tree | 698c0e5d08db94d627300a82c97bb9df69ff4ccb /meta/lib | |
parent | fbc879c351df6b467bc0309f75657641d868e1ae (diff) | |
download | poky-7048d3d1f0df13afad8fcc1216ce159d8198a978.tar.gz |
lib/oe/rootfs: introduce IMAGE_LOG_CHECK_EXCLUDES
When using rpm as package manager and trying to install a file called
'/usr/share/doc/What to when an Error occurs.txt'
log_check falsely errors out on the build, because used regex match on
'DEBUG: Removing manifest: /path/usr/share/doc/What
to when an Error occurs.txt'.
To handle such cases introduce IMAGE_LOG_CHECK_EXCLUDES, to allow
user to add custom exclude regex to log_check exclude list
(From OE-Core rev: 7c7555a79b8bdef0a8d7fbd57e9ddf059066de76)
Signed-off-by: Konrad Weihmann <kweihmann@outlook.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/rootfs.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 3813f68e8b..4e09eae6b9 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -55,6 +55,8 @@ class Rootfs(object, metaclass=ABCMeta): | |||
55 | excludes = [ 'log_check', r'^\+' ] | 55 | excludes = [ 'log_check', r'^\+' ] |
56 | if hasattr(self, 'log_check_expected_regexes'): | 56 | if hasattr(self, 'log_check_expected_regexes'): |
57 | excludes.extend(self.log_check_expected_regexes) | 57 | excludes.extend(self.log_check_expected_regexes) |
58 | # Insert custom log_check excludes | ||
59 | excludes += [x for x in (self.d.getVar("IMAGE_LOG_CHECK_EXCLUDES") or "").split(" ") if x] | ||
58 | excludes = [re.compile(x) for x in excludes] | 60 | excludes = [re.compile(x) for x in excludes] |
59 | r = re.compile(match) | 61 | r = re.compile(match) |
60 | log_path = self.d.expand("${T}/log.do_rootfs") | 62 | log_path = self.d.expand("${T}/log.do_rootfs") |