summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Bartosh <ed.bartosh@linux.intel.com>2015-09-28 21:45:11 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-09-29 14:11:36 +0100
commite1851fe04c812d226b0d612732c0579a2bd83822 (patch)
treee9605230b0b236ba08e9b36f3d9b5d43369cd44f
parentf78f90240a3041be426c6ba9085849352164ee8b (diff)
downloadpoky-e1851fe04c812d226b0d612732c0579a2bd83822.tar.gz
bitbake: toaster: make a workaround for old style index
For a new style indexes 'inherits' field is used to determine if recipe is an image recipe. As old style indexes don't have 'inherits' field this can be guessed from recipe name. Let's consider recipe an image recipe if recipe name contains '-image-'. (Bitbake rev: d769d3f54faaf1a3091b1eb6ed1d17a8a108210a) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/orm/models.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py
index 883ecf4e50..b5c864354d 100644
--- a/bitbake/lib/toaster/orm/models.py
+++ b/bitbake/lib/toaster/orm/models.py
@@ -974,6 +974,8 @@ class LayerIndexLayerSource(LayerSource):
974 ro.file_path = ri['filepath'] + "/" + ri['filename'] 974 ro.file_path = ri['filepath'] + "/" + ri['filename']
975 if 'inherits' in ri: 975 if 'inherits' in ri:
976 ro.is_image = 'image' in ri['inherits'].split() 976 ro.is_image = 'image' in ri['inherits'].split()
977 else: # workaround for old style layer index
978 ro.is_image = "-image-" in ri['pn']
977 ro.save() 979 ro.save()
978 except IntegrityError as e: 980 except IntegrityError as e:
979 logger.debug("Failed saving recipe, ignoring: %s (%s:%s)" % (e, ro.layer_version, ri['filepath']+"/"+ri['filename'])) 981 logger.debug("Failed saving recipe, ignoring: %s (%s:%s)" % (e, ro.layer_version, ri['filepath']+"/"+ri['filename']))