summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/lib/oe/rootfs.py13
1 files changed, 13 insertions, 0 deletions
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py
index a2af3325ee..f677d03a12 100644
--- a/meta/lib/oe/rootfs.py
+++ b/meta/lib/oe/rootfs.py
@@ -63,6 +63,15 @@ class Rootfs(object):
63 if 'log_check' in line: 63 if 'log_check' in line:
64 continue 64 continue
65 65
66 if hasattr(self, 'log_check_expected_errors_regexes'):
67 m = None
68 for ee in self.log_check_expected_errors_regexes:
69 m = re.search(ee, line)
70 if m:
71 break
72 if m:
73 continue
74
66 m = r.search(line) 75 m = r.search(line)
67 if m: 76 if m:
68 found_error = 1 77 found_error = 1
@@ -623,6 +632,10 @@ class DpkgRootfs(DpkgOpkgRootfs):
623 def __init__(self, d, manifest_dir): 632 def __init__(self, d, manifest_dir):
624 super(DpkgRootfs, self).__init__(d) 633 super(DpkgRootfs, self).__init__(d)
625 self.log_check_regex = '^E:' 634 self.log_check_regex = '^E:'
635 self.log_check_expected_errors_regexes = \
636 [
637 "^E: Unmet dependencies."
638 ]
626 639
627 bb.utils.remove(self.image_rootfs, True) 640 bb.utils.remove(self.image_rootfs, True)
628 bb.utils.remove(self.d.getVar('MULTILIB_TEMP_ROOTFS', True), True) 641 bb.utils.remove(self.d.getVar('MULTILIB_TEMP_ROOTFS', True), True)