]> code.ossystems Code Review - openembedded-core.git/commitdiff
oe/recipeutils: Fix copying patches when BBLAYERS entries are not normalised
authorAndrei Gherzan <andrei.gherzan@huawei.com>
Thu, 18 Feb 2021 21:14:03 +0000 (21:14 +0000)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 10 Mar 2021 00:24:18 +0000 (00:24 +0000)
`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: Anuj Mittal <anuj.mittal@intel.com>
meta/lib/oe/recipeutils.py

index ef69ef207f4a1e3a7043c0895770ff49d21915c0..407d16889464246dfbd9d26ce8debb0331e0d0fc 100644 (file)
@@ -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)