[sumo,7/8] toaster/models.py: allow local paths for custom recipe's base

Submitted by Belal, Awais on July 6, 2018, 10:43 a.m. | Patch ID: 152385

Details

Message ID 1530873839-4445-7-git-send-email-awais_belal@mentor.com
State New
Headers show

Commit Message

Belal, Awais July 6, 2018, 10:43 a.m. 
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.

Signed-off-by: Awais Belal <awais_belal@mentor.com>
---
 bitbake/lib/toaster/orm/models.py | 7 +++++++
 1 file changed, 7 insertions(+)

Patch hide | download patch | download mbox 

diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 3a7dff8..4b77e8f 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/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):