diff options
| author |   Jose Quaresma <quaresma.jose@gmail.com> | 2022-10-14 16:22:46 +0100 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2022-11-17 07:23:06 -1000 |
| commit | 8e65e5d9204cbc04587b7e90ff4ed8cd7bffdb65 (patch) | |
| tree | 3b4dce48413787cd08331bb10290f2704fd6fe60 | |
| parent | 9485559d269ed11bfcc90399c9282549ced35ce0 (diff) | |
| download | openembedded-core-contrib-8e65e5d9204cbc04587b7e90ff4ed8cd7bffdb65.tar.gz | |
archiver: avoid using machine variable as it breaks multiconfig
STAGING_KERNEL_DIR uses the MACHINE name so it breaks the multiconfig
and in this cases it will run the shared recipes twice, one for each
machine.
STAGING_KERNEL_DIR it's been introduced in commit 5487dee2e1
Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 6050d1f74c02495490d982ead2993b6b3c9cc04a)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/classes/archiver.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index dca4271a69..4a5865d7b5 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -461,7 +461,7 @@ def is_work_shared(d): pn = d.getVar('PN') return pn.startswith('gcc-source') or \ bb.data.inherits_class('kernel', d) or \ - (bb.data.inherits_class('kernelsrc', d) and d.getVar('S') == d.getVar('STAGING_KERNEL_DIR')) + (bb.data.inherits_class('kernelsrc', d) and d.expand("${TMPDIR}/work-shared") in d.getVar('S')) # Run do_unpack and do_patch python do_unpack_and_patch() { |