diff options
| author | Alexander Kanavin <alex.kanavin@gmail.com> | 2024-01-26 14:34:49 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-27 08:20:02 +0000 |
| commit | 55bfa994518ab5a0532c0ffb021f8131f0a8ba77 (patch) | |
| tree | 2d4a4d86f799046d3ebb49520714b13767ee4e51 /meta/classes | |
| parent | ed0818060868a7797ff287e1dee68bef718659c7 (diff) | |
| download | poky-55bfa994518ab5a0532c0ffb021f8131f0a8ba77.tar.gz | |
classes/multilib: expand PACKAGE_WRITE_DEPS in addition to DEPENDS
Otherwise, PACKAGE_WRITE_DEPS would contain non-multilib variants
of dependencies even when building multilib items, resulting in
sysroots being populated with entirely wrong versions of them.
This hasn't been noticed until now through sheer (bad) luck, I think,
except in the cpio recipe, but the previous commit shows that the issues
did occur, quietly. Every other recipe in oe-core and meta-oe does not
prepend the multilib prefix.
(From OE-Core rev: 234965cb88ccfa9c3a357928f7155b119044e8fc)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/multilib.bbclass | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass index d80a34cf27..b6c09969b1 100644 --- a/meta/classes/multilib.bbclass +++ b/meta/classes/multilib.bbclass | |||
| @@ -140,6 +140,7 @@ python multilib_virtclass_handler_postkeyexp () { | |||
| 140 | return | 140 | return |
| 141 | 141 | ||
| 142 | clsextend.map_depends_variable("DEPENDS") | 142 | clsextend.map_depends_variable("DEPENDS") |
| 143 | clsextend.map_depends_variable("PACKAGE_WRITE_DEPS") | ||
| 143 | clsextend.map_variable("PROVIDES") | 144 | clsextend.map_variable("PROVIDES") |
| 144 | 145 | ||
| 145 | if bb.data.inherits_class('cross-canadian', d): | 146 | if bb.data.inherits_class('cross-canadian', d): |