diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-09-06 08:26:40 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-09-11 23:48:09 +0300 |
commit | 5dd7cbb3457c90724fc442b15bab2082d82b560a (patch) | |
tree | 368ed59906a1874f33a3a4a44fbb2f544013dc0a /poky/bitbake/lib/toaster/orm | |
parent | 3b32a97b1b171ca776a24454d22c1c59fc7bfa00 (diff) | |
download | openbmc-5dd7cbb3457c90724fc442b15bab2082d82b560a.tar.xz |
poky: sumo refresh 45ef387cc5..51872d3f99
Update poky to sumo HEAD.
Awais Belal (8):
bitbake: toaster: allow pokydirname to be evaluated when all layers are local
bitbake: toaster: use a more flexible way to find bitbake
bitbake: bitbake: toaster: allow TOASTER_DIR to be overridden from cmdline
bitbake: toaster/widgets.py: avoid divide by zero issues
bitbake: toastergui/newproject.html: fix release divs
bitbake: toaster/checksettings: allow CUSTOM_XML_ONLY setting through env
bitbake: toaster/models.py: allow local paths for custom recipe's base
bitbake: toaster/layerdetails.js: don't hide local layer info
Karsten Strand (1):
bitbake: bitbake: toaster: Fix comparison in recipe template
Change-Id: I8dbcad1d98ff8d3c660563781d887a2c91db5bf2
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/bitbake/lib/toaster/orm')
-rw-r--r-- | poky/bitbake/lib/toaster/orm/models.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/poky/bitbake/lib/toaster/orm/models.py b/poky/bitbake/lib/toaster/orm/models.py index 3a7dff8ca..4b77e8fda 100644 --- a/poky/bitbake/lib/toaster/orm/models.py +++ b/poky/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): |