diff options
author | Andrei Gherzan <andrei.gherzan@huawei.com> | 2021-02-18 21:14:03 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-02-19 11:17:11 +0000 |
commit | cbb794f9dd843f6d8a6f74d7cda654c59ad25df4 (patch) | |
tree | cfa62f7d4111ae7e289ac45b554dc272e11a55f1 | |
parent | c640057edaf4e9e62bc63943808c49af91312374 (diff) | |
download | poky-cbb794f9dd843f6d8a6f74d7cda654c59ad25df4.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: 777fc24ab2c332954b56dac28cd9b3032808828c)
Signed-off-by: Andrei Gherzan <andrei.gherzan@huawei.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oe/recipeutils.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/recipeutils.py b/meta/lib/oe/recipeutils.py index ef69ef207f..407d168894 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) |