summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndrei Gherzan <andrei.gherzan@huawei.com>2021-02-18 21:14:03 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-03-04 17:39:10 +0000
commit16e52a768a7787d0c233d7648cb1da7d0cc70b2f (patch)
tree9ec9bb7efbad68d912987ce117e1af6726284ef9 /meta
parent15496693ede24fcab5bdd89e03f60e26e6350853 (diff)
downloadpoky-16e52a768a7787d0c233d7648cb1da7d0cc70b2f.tar.gz
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> (From OE-Core rev: 7677ba25994ab6807519f3920c8cf6ad414ac415) 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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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
409 fetch.download() 409 fetch.download()
410 for pth in fetch.localpaths(): 410 for pth in fetch.localpaths():
411 if pth not in localpaths: 411 if pth not in localpaths:
412 localpaths.append(pth) 412 localpaths.append(os.path.abspath(pth))
413 uri_values.append(srcuri) 413 uri_values.append(srcuri)
414 414
415 fetch_urls(d) 415 fetch_urls(d)