From 808f700efcb98f5344c18db6c91b83a9e4bd15e8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 1 May 2024 21:34:02 +0100 Subject: classes/lib/scripts: Initial WORKDIR -> UNPACKDIR updates Work through the initial issues I found where we need to change WORKDIR to UNPACKDIR. (From OE-Core rev: 86fec41b1e809d1a2fa2feadc26d29020df53d39) Signed-off-by: Richard Purdie --- scripts/lib/recipetool/append.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/lib/recipetool/append.py') diff --git a/scripts/lib/recipetool/append.py b/scripts/lib/recipetool/append.py index 341e893305..10945d6008 100644 --- a/scripts/lib/recipetool/append.py +++ b/scripts/lib/recipetool/append.py @@ -101,7 +101,7 @@ def determine_file_source(targetpath, rd): import oe.recipeutils # See if it's in do_install for the recipe - workdir = rd.getVar('WORKDIR') + unpackdir = rd.getVar('UNPACKDIR') src_uri = rd.getVar('SRC_URI') srcfile = '' modpatches = [] @@ -113,9 +113,9 @@ def determine_file_source(targetpath, rd): if not srcpath.startswith('/'): # Handle non-absolute path srcpath = os.path.abspath(os.path.join(rd.getVarFlag('do_install', 'dirs').split()[-1], srcpath)) - if srcpath.startswith(workdir): + if srcpath.startswith(unpackdir): # OK, now we have the source file name, look for it in SRC_URI - workdirfile = os.path.relpath(srcpath, workdir) + workdirfile = os.path.relpath(srcpath, unpackdir) # FIXME this is where we ought to have some code in the fetcher, because this is naive for item in src_uri.split(): localpath = bb.fetch2.localpath(item, rd) -- cgit v1.2.3-54-g00ecf