summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJose Quaresma <quaresma.jose@gmail.com>2022-10-14 16:22:46 +0100
committerSteve Sakoman <steve@sakoman.com>2022-11-19 03:59:47 -1000
commita71a5343838571e094ead68a42c757f0c43a41b1 (patch)
tree0c5f0a96afd00a276d0bd937ecd4ac474ce7ad55
parent6f5e10d682be54a70456c4cea9abbde4add1fead (diff)
downloadopenembedded-core-contrib-a71a5343838571e094ead68a42c757f0c43a41b1.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.bbclass2
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):
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() {