From bed811824bd9a0158c3564ed85fc6582df1bdba7 Mon Sep 17 00:00:00 2001 From: Harish Sadineni Date: Thu, 6 Feb 2025 03:53:19 -0800 Subject: oeqa/sdk/context: fix for gtk3 test failure during do_testsdk The do_testsdk for lib32-core-image-sato aborts with below error: configure: error: Package requirements (gtk+-3.0) were not met: No package 'gtk+-3.0' found Consider adjusting the PKG_CONFIG_PATH environment variable if you installed software in a non-standard prefix. This causes due to an absolute path name in 'sdk_env', which is now stripped to have only the environment name. Backport from oe-core master: https://git.openembedded.org/openembedded-core/commit/?id=386e4132a9ced75599d92610cf5c0e8fe907c3b6 (From OE-Core rev: 83c3e40e2361d771a724062e38a1349b87059c75) Signed-off-by: Harish Sadineni Signed-off-by: Steve Sakoman --- meta/lib/oeqa/sdk/context.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'meta/lib/oeqa/sdk/context.py') diff --git a/meta/lib/oeqa/sdk/context.py b/meta/lib/oeqa/sdk/context.py index 01c38c24e6..77e6a98f39 100644 --- a/meta/lib/oeqa/sdk/context.py +++ b/meta/lib/oeqa/sdk/context.py @@ -41,11 +41,13 @@ class OESDKTestContext(OETestContext): def hasTargetPackage(self, pkg, multilib=False, regex=False): if multilib: - # match multilib according to sdk_env - mls = self.td.get('MULTILIB_VARIANTS', '').split() - for ml in mls: - if ('ml'+ml) in self.sdk_env: - pkg = ml + '-' + pkg + stripped_sdk_env = os.path.basename(self.sdk_env) + if stripped_sdk_env.startswith('environment-setup-'): + # match multilib according to sdk_env + mls = self.td.get('MULTILIB_VARIANTS', '').split() + for ml in mls: + if ('ml'+ml) in stripped_sdk_env: + pkg = ml + '-' + pkg return self._hasPackage(self.target_pkg_manifest, pkg, regex=regex) class OESDKTestContextExecutor(OETestContextExecutor): -- cgit v1.2.3-54-g00ecf