From 1935e4e8df5d5825a668202cf185628353cea930 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Sz=C5=91ke?= Date: Fri, 14 Jun 2024 09:37:29 +0200 Subject: [PATCH] archiver.bbclass: Fix work-shared checking for kernel recipes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Source dir can be a symbolic link in some BSP's linux kernel recipe which points to work-shared path (like linux-fslc in meta-freescale). Change to use os.path.realpath() in order to get real path of source dir. (From OE-Core rev: 340dc094df5eda4a3834a90578b331d9edcffa94) Signed-off-by: Benjamin Szőke Signed-off-by: Richard Purdie (cherry picked from commit 9191aa685418af32f003e067ef7c5737a271e3a5) Signed-off-by: Steve Sakoman --- meta/classes/archiver.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 2d0bbfbd42..9d286224d6 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -473,7 +473,8 @@ def create_diff_gz(d, src_orig, src, ar_outdir): def is_work_shared(d): sharedworkdir = os.path.join(d.getVar('TMPDIR'), 'work-shared') - return d.getVar('S').startswith(sharedworkdir) + sourcedir = os.path.realpath(d.getVar('S')) + return sourcedir.startswith(sharedworkdir) # Run do_unpack and do_patch python do_unpack_and_patch() {