aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKonrad Weihmann <kweihmann@outlook.com>2020-10-16 21:46:23 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-10-20 11:11:41 +0100
commit7c7555a79b8bdef0a8d7fbd57e9ddf059066de76 (patch)
treebc00eff4dda562be6945e2eed19c1d3925074315
parent21bdff510a7673ccf7f27f551b641a5ba84d656c (diff)
downloadopenembedded-core-contrib-7c7555a79b8bdef0a8d7fbd57e9ddf059066de76.tar.gz
openembedded-core-contrib-7c7555a79b8bdef0a8d7fbd57e9ddf059066de76.tar.bz2
openembedded-core-contrib-7c7555a79b8bdef0a8d7fbd57e9ddf059066de76.zip
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 <kweihmann@outlook.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/lib/oe/rootfs.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index 3813f68e8b5..4e09eae6b91 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")