mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
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>
This commit is contained in:
committed by
Richard Purdie
parent
e265fbba3c
commit
b8ebac9794
@@ -63,6 +63,15 @@ class Rootfs(object):
|
||||
if 'log_check' in line:
|
||||
continue
|
||||
|
||||
if hasattr(self, 'log_check_expected_errors_regexes'):
|
||||
m = None
|
||||
for ee in self.log_check_expected_errors_regexes:
|
||||
m = re.search(ee, line)
|
||||
if m:
|
||||
break
|
||||
if m:
|
||||
continue
|
||||
|
||||
m = r.search(line)
|
||||
if m:
|
||||
found_error = 1
|
||||
@@ -623,6 +632,10 @@ class DpkgRootfs(DpkgOpkgRootfs):
|
||||
def __init__(self, d, manifest_dir):
|
||||
super(DpkgRootfs, self).__init__(d)
|
||||
self.log_check_regex = '^E:'
|
||||
self.log_check_expected_errors_regexes = \
|
||||
[
|
||||
"^E: Unmet dependencies."
|
||||
]
|
||||
|
||||
bb.utils.remove(self.image_rootfs, True)
|
||||
bb.utils.remove(self.d.getVar('MULTILIB_TEMP_ROOTFS', True), True)
|
||||
|
||||
Reference in New Issue
Block a user