From: Robert Yang <liezhi.yang@windriver.com>
Date: Mon, 11 Dec 2023 15:13:17 +0000 (-0800)
Subject: archiver.bbclass: Improve work-shared checking
X-Git-Tag: yocto-5.2~4317
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5fbb4ca8da4f4f1ea426275c45634802dcb5a575;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

archiver.bbclass: Improve work-shared checking

There are other recipes except the listed ones which use work-shared, improve
the checking to make other recipes such as llvm-project-source work with
do_ar_patched.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---

diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 0eee1abefab..80a69cf31db 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -468,10 +468,8 @@ def create_diff_gz(d, src_orig, src, ar_outdir):
         os.chdir(cwd)
 
 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.expand("${TMPDIR}/work-shared") in d.getVar('S'))
+    sharedworkdir = os.path.join(d.getVar('TMPDIR'), 'work-shared')
+    return d.getVar('S').startswith(sharedworkdir)
 
 # Run do_unpack and do_patch
 python do_unpack_and_patch() {