summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2016-01-06 04:21:36 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-01-11 23:26:31 +0000
commitb8ebac97949d47b3cc8b27f202dc6a803c03850d (patch)
treea2ed06c972e3326e205d2cc55a2f4808be652d4b /meta
parente265fbba3c5db8b1600276e10dd1f3cee7973327 (diff)
downloadpoky-b8ebac97949d47b3cc8b27f202dc6a803c03850d.tar.gz
DpkgRootfs: Fix logcheck_error false-positive when use multilib
Rootfs with dpkg was failing due to false-positive in logcheck_error because current logic of DpkgPM handles missing dependencies failure using apt-get -f install [1][2]. This support was broken due to addition of logcheck and don't take into account dpkgpm cases, in order to fix add an attr for specify expected errors regex'es by package manager. [1] http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/lib/oe/rootfs.py#n659 [2] http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/lib/oe/package_manager.py#n2038 (From OE-Core rev: fa7a5ebef87883755491b847c2f4e1a7b021d585) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Matt Madison <matt@madison.systems> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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)