From 7c7555a79b8bdef0a8d7fbd57e9ddf059066de76 Mon Sep 17 00:00:00 2001 From: Konrad Weihmann Date: Fri, 16 Oct 2020 21:46:23 +0200 Subject: 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 Signed-off-by: Konrad Weihmann Signed-off-by: Richard Purdie --- meta/lib/oe/rootfs.py | 2 ++ 1 file changed, 2 insertions(+) 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): excludes = [ 'log_check', r'^\+' ] if hasattr(self, 'log_check_expected_regexes'): excludes.extend(self.log_check_expected_regexes) + # Insert custom log_check excludes + excludes += [x for x in (self.d.getVar("IMAGE_LOG_CHECK_EXCLUDES") or "").split(" ") if x] excludes = [re.compile(x) for x in excludes] r = re.compile(match) log_path = self.d.expand("${T}/log.do_rootfs") -- cgit 1.2.3-korg