diff options
| author | Jose Quaresma <quaresma.jose@gmail.com> | 2022-10-14 16:22:46 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-02 11:04:32 +0000 |
| commit | cd2f92ceea9c59d02eb18bf66a904a41f4451332 (patch) | |
| tree | 32b5c69ff8a802fabba613adda6ca9f6f23d4f38 /meta/classes/archiver.bbclass | |
| parent | b5baa7dc8bd1c0d2d78c532d97a44120346b5edd (diff) | |
| download | poky-cd2f92ceea9c59d02eb18bf66a904a41f4451332.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
(From OE-Core rev: 6050d1f74c02495490d982ead2993b6b3c9cc04a)
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>
Diffstat (limited to 'meta/classes/archiver.bbclass')
| -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 0710c1ec5e..4049694d85 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass | |||
| @@ -465,7 +465,7 @@ def is_work_shared(d): | |||
| 465 | pn = d.getVar('PN') | 465 | pn = d.getVar('PN') |
| 466 | return pn.startswith('gcc-source') or \ | 466 | return pn.startswith('gcc-source') or \ |
| 467 | bb.data.inherits_class('kernel', d) or \ | 467 | bb.data.inherits_class('kernel', d) or \ |
| 468 | (bb.data.inherits_class('kernelsrc', d) and d.getVar('S') == d.getVar('STAGING_KERNEL_DIR')) | 468 | (bb.data.inherits_class('kernelsrc', d) and d.expand("${TMPDIR}/work-shared") in d.getVar('S')) |
| 469 | 469 | ||
| 470 | # Run do_unpack and do_patch | 470 | # Run do_unpack and do_patch |
| 471 | python do_unpack_and_patch() { | 471 | python do_unpack_and_patch() { |