[oe-commits] [bitbake] 07/09: toaster/models.py: allow local paths for custom recipe's base
git at git.openembedded.org
git at git.openembedded.org
Mon Sep 10 20:02:24 UTC 2018
This is an automated email from the git hooks/post-receive script.
rpurdie pushed a commit to branch 1.38
in repository bitbake.
commit 30f622dbd874b800c5bbdbeac992dd7783092928
Author: Awais Belal <awais_belal at mentor.com>
AuthorDate: Wed Sep 5 22:26:46 2018 -0700
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 at mentor.com>
Signed-off-by: David Reyna <David.Reyna at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
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 3a7dff8..4b77e8f 100644
--- a/lib/toaster/orm/models.py
+++ b/lib/toaster/orm/models.py
@@ -1663,6 +1663,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
@@ -1670,6 +1673,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):
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list