From: Trevor Woerner Date: Fri, 31 Jul 2026 15:28:08 +0000 (-0400) Subject: oeqa/selftest/wic: drop dead COREBASE/scripts wic lookup X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc6e389180e49c583c9f2b504ec4402cd72309d3;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git oeqa/selftest/wic: drop dead COREBASE/scripts wic lookup wic moved to a standalone repository and is no longer shipped in scripts/, so that search path can never match. Look for wic only in the wic-tools native sysroot. AI-Generated: codex/claude-opus 4.8 (xhigh) Signed-off-by: Trevor Woerner Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index 4e94f4d39a..c5a053ef9c 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py @@ -89,18 +89,11 @@ class WicTestCase(OESelftestTestCase): def _get_wic_path(self): if WicTestCase.wic_bindir is None: - search_paths = [ - os.path.join(self.td['COREBASE'], 'scripts'), - os.path.join(get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools'), 'usr', 'bin'), - ] - - for bindir in search_paths: - if os.path.exists(os.path.join(bindir, 'wic')): - WicTestCase.wic_bindir = bindir - break - - if WicTestCase.wic_bindir is None: - self.fail("Unable to find the wic binary in %s" % ', '.join(search_paths)) + bindir = os.path.join(get_bb_var('RECIPE_SYSROOT_NATIVE', 'wic-tools'), + 'usr', 'bin') + if not os.path.exists(os.path.join(bindir, 'wic')): + self.fail("Unable to find the wic binary in %s" % bindir) + WicTestCase.wic_bindir = bindir path_entries = [] for path_group in (