diff options
| author | Changqing Li <changqing.li@windriver.com> | 2024-12-10 14:24:55 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-12-12 12:59:35 +0000 |
| commit | 90c6a405c547aaaf5f78779853ea4539724ca837 (patch) | |
| tree | 47bc2c05294276b83aec7467998d7b2979c99ccb /meta | |
| parent | 7e3d21d0b2e1b1bcacb61f592d47798d900b1732 (diff) | |
| download | poky-90c6a405c547aaaf5f78779853ea4539724ca837.tar.gz | |
base.bbclass: fix RRECOMMENDS extend issue for multilib
During handle PACKAGECONFIG, DEPENDS/RDEPENDS/RRECOMMENDS is appended by
calling function appendVar according to the PACKAGECONFIG setting:
PACKAGECONFIG[f1] = "\
--with-f1, \
--without-f1, \
build-deps-for-f1, \
runtime-deps-for-f1, \
runtime-recommends-for-f1, \
packageconfig-conflicts-for-f1"
[snip of base.bbclass]
pkgconfigflags = d.getVarFlags("PACKAGECONFIG") or {}
if pkgconfigflags:
...
appendVar('DEPENDS', extradeps)
appendVar('RDEPENDS:${PN}', extrardeps)
appendVar('RRECOMMENDS:${PN}', extrarrecs)
...
[snip of base.bbclass]
After following commit in meta-oe,
[fe3ba7ac5c cryptsetup: demote udev runtime dependency to recommendation]
'udev lvm2' changed from RDEPENDS to RRECOMMENDS, but RRECOMMENDS is not
handled in this process, and causes following error:
$bitbake lib32-cryptsetup
ERROR: QA Issue: lib32-cryptsetup package lib32-cryptsetup - suspicious values 'udev lvm2' in RRECOMMENDS [multilib]
In layer openembedded-core, we do have very few recipes that have
runtime-recommends-for-f1 in PACKAGECONFIG setting, but f1 is not
enabled in PACKAGECONFIGS, so not report error when multilib is enabled.
(From OE-Core rev: 2f539a1318a80d3ad5d0d43a9ba4070465e402af)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes-global/base.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass index b81e61fdb7..101ecdcf0f 100644 --- a/meta/classes-global/base.bbclass +++ b/meta/classes-global/base.bbclass | |||
| @@ -471,7 +471,7 @@ python () { | |||
| 471 | def appendVar(varname, appends): | 471 | def appendVar(varname, appends): |
| 472 | if not appends: | 472 | if not appends: |
| 473 | return | 473 | return |
| 474 | if varname.find("DEPENDS") != -1: | 474 | if "DEPENDS" in varname or varname.startswith("RRECOMMENDS"): |
| 475 | if bb.data.inherits_class('nativesdk', d) or bb.data.inherits_class('cross-canadian', d) : | 475 | if bb.data.inherits_class('nativesdk', d) or bb.data.inherits_class('cross-canadian', d) : |
| 476 | appends = expandFilter(appends, "", "nativesdk-") | 476 | appends = expandFilter(appends, "", "nativesdk-") |
| 477 | elif bb.data.inherits_class('native', d): | 477 | elif bb.data.inherits_class('native', d): |
