From 59f3e04122fca43835603779ac2d201464fbaebf Mon Sep 17 00:00:00 2001 From: Awais Belal Date: Sun, 26 Aug 2018 15:33:30 -0700 Subject: toaster/models.py: allow local paths for custom recipe's base In a case where the layer source is local only and the recipe is not yet built, we can search for the path with layer's local_source_dir, and if available that should be used rather than just skipping the scenario. [YOCTO #12891] Signed-off-by: Awais Belal Signed-off-by: David Reyna Signed-off-by: Richard Purdie --- lib/toaster/orm/models.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/lib/toaster/orm/models.py b/lib/toaster/orm/models.py index 306c4fafa..be0bda5b1 100644 --- a/lib/toaster/orm/models.py +++ b/lib/toaster/orm/models.py @@ -1712,6 +1712,9 @@ class CustomImageRecipe(Recipe): path_schema_two = self.base_recipe.file_path + path_schema_three = "%s/%s" % (self.base_recipe.layer_version.layer.local_source_dir, + self.base_recipe.file_path) + if os.path.exists(path_schema_one): return path_schema_one @@ -1719,6 +1722,10 @@ class CustomImageRecipe(Recipe): if os.path.exists(path_schema_two): return path_schema_two + # Or a local path if all layers are local + if os.path.exists(path_schema_three): + return path_schema_three + return None def generate_recipe_file_contents(self): -- cgit 1.2.3-korg