sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: toaster: orm generate CustomImageRecipe contents try secondary path 

Try a secondary file path if the first does not exist. When we get the
recipe paths and layer information from the layer index it is not a
complete path but we are usually able to reconstruct it. If the complete
real path has been discovered by building then use this instead.

[YOCTO #9206]

(Bitbake rev: 238db2e03405d259d48dfc477a276191e6a47698)

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Elliot Smith <elliot.smith@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Michael Wood 2016-03-23 08:28:40 +00:00 committed by Richard Purdie
parent 5c49230deb
commit 1d1aaa2f56
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bitbake/lib/toaster/orm/models.py
View File

@ -1534,10 +1534,13 @@ class CustomImageRecipe(Recipe):
packages_conf += pkg.name+' '
packages_conf += "\""
base_recipe = open("%s/%s" %
(self.base_recipe.layer_version.dirpath,
self.base_recipe.file_path), 'r').read()
try:
base_recipe = open("%s/%s" %
(self.base_recipe.layer_version.dirpath,
self.base_recipe.file_path), 'r').read()
except IOError:
# The path may now be the full path if the recipe has been built
base_recipe = open(self.base_recipe.file_path, 'r').read()
# Add a special case for when the recipe we have based a custom image
# recipe on requires another recipe.