summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrei Gherzan <andrei.gherzan@huawei.com>2021-02-18 21:14:03 +0000
committerSteve Sakoman <steve@sakoman.com>2021-03-04 04:19:50 -1000
commit7677ba25994ab6807519f3920c8cf6ad414ac415 (patch)
treef53917634b7a65b070840324903a3b34f579d7da
parent00af6882a24ca69f9e8147546a220dc73e4d6087 (diff)
downloadopenembedded-core-contrib-7677ba25994ab6807519f3920c8cf6ad414ac415.tar.gz
openembedded-core-contrib-7677ba25994ab6807519f3920c8cf6ad414ac415.tar.bz2
openembedded-core-contrib-7677ba25994ab6807519f3920c8cf6ad414ac415.zip
oe/recipeutils: Fix copying patches when BBLAYERS entries are not normalised
`devtool` uses `copy_recipe_files` for the upgrade operation when creating the new, workspace recipe. Before handling the copy operations, the function checks the entry in `SRC_URI` against `FILE` while in turn uses absolute paths. When BBLAYERS contains entries that are not normalised, this check will fail resulting in having the recipe in the workspace without the initial patches. Signef-off-by: Robert Drab <robert.drab@huawei.com> Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 777fc24ab2c332954b56dac28cd9b3032808828c) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/lib/oe/recipeutils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py
index fde1ad3ddd..f36a2fb0ac 100644
--- a/meta/lib/oe/recipeutils.py
+++ b/meta/lib/oe/recipeutils.py
@@ -409,7 +409,7 @@ def copy_recipe_files(d, tgt_dir, whole_dir=False, download=True, all_variants=F
fetch.download()
for pth in fetch.localpaths():
if pth not in localpaths:
- localpaths.append(pth)
+ localpaths.append(os.path.abspath(pth))
uri_values.append(srcuri)
fetch_urls(d)