diff options
author | Saul Wold <sgw@bigsur.com> | 2023-12-23 17:12:07 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-12-28 10:57:49 +0000 |
commit | acf45e764ca439fe38192a7e5d394d2a62bff886 (patch) | |
tree | d71c94211996f43c00495a616d50e1f72d75686a /meta/lib/oeqa/runtime | |
parent | b723fcaac52f4e371f22c191b0b70dfcf4489925 (diff) | |
download | poky-acf45e764ca439fe38192a7e5d394d2a62bff886.tar.gz |
package.py: OEHasPackage: Add MLPREFIX to packagename
FIXES [YOCTO #12342]
When testing a Multilib image, the package manifest list contains
the fully qualified package name which includes the Multilib Prefix.
This patch adds the MLPREFIX to the package names that are passed
into the @OEHasPackage() decorator to ensure the set isdisjoint()
matches correctly.
(From OE-Core rev: ab87e4f92305b2a664cc473869e1615cf56e0936)
Signed-off-by: Saul Wold <sgw@bigsur.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/runtime')
-rw-r--r-- | meta/lib/oeqa/runtime/decorator/package.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/lib/oeqa/runtime/decorator/package.py b/meta/lib/oeqa/runtime/decorator/package.py index 8aba3f325b..b78ac9fc38 100644 --- a/meta/lib/oeqa/runtime/decorator/package.py +++ b/meta/lib/oeqa/runtime/decorator/package.py | |||
@@ -38,11 +38,12 @@ class OEHasPackage(OETestDecorator): | |||
38 | if isinstance(self.need_pkgs, str): | 38 | if isinstance(self.need_pkgs, str): |
39 | self.need_pkgs = [self.need_pkgs,] | 39 | self.need_pkgs = [self.need_pkgs,] |
40 | 40 | ||
41 | mlprefix = self.case.td.get("MLPREFIX") | ||
41 | for pkg in self.need_pkgs: | 42 | for pkg in self.need_pkgs: |
42 | if pkg.startswith('!'): | 43 | if pkg.startswith('!'): |
43 | unneed_pkgs.add(pkg[1:]) | 44 | unneed_pkgs.add(mlprefix + pkg[1:]) |
44 | else: | 45 | else: |
45 | need_pkgs.add(pkg) | 46 | need_pkgs.add(mlprefix + pkg) |
46 | 47 | ||
47 | if unneed_pkgs: | 48 | if unneed_pkgs: |
48 | msg = 'Checking if %s is not installed' % ', '.join(unneed_pkgs) | 49 | msg = 'Checking if %s is not installed' % ', '.join(unneed_pkgs) |