diff options
author | Awais Belal <awais_belal@mentor.com> | 2018-08-26 15:33:30 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-28 00:02:54 +0100 |
commit | 59f3e04122fca43835603779ac2d201464fbaebf (patch) | |
tree | 61dc25b95b8b4d7e9e4960c654c8e6204f5ee7b3 /lib | |
parent | 55333f1c3ded1c53120e6cb32b440cc707521e2b (diff) | |
download | bitbake-contrib-59f3e04122fca43835603779ac2d201464fbaebf.tar.gz |
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 <awais_belal@mentor.com>
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/toaster/orm/models.py | 7 |
1 files changed, 7 insertions, 0 deletions
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): |