[oe-commits] [bitbake] 40/40: toaster: buildinfohelper Add handling local layers (i.e. non-git) layers
git at git.openembedded.org
git at git.openembedded.org
Wed Aug 10 23:12:23 UTC 2016
rpurdie pushed a commit to branch master
in repository bitbake.
commit 0a9b5d7d9655dbb09d458fc6e330e932f0f9dab6
Author: Michael Wood <michael.g.wood at intel.com>
AuthorDate: Tue Aug 9 13:50:12 2016 +0100
toaster: buildinfohelper Add handling local layers (i.e. non-git) layers
Adds handling of the non-git layers to create and update the
corresponding layer objects in Toaster.
Signed-off-by: Michael Wood <michael.g.wood at intel.com>
---
lib/bb/ui/buildinfohelper.py | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/lib/bb/ui/buildinfohelper.py b/lib/bb/ui/buildinfohelper.py
index 5044324..7a16ec6 100644
--- a/lib/bb/ui/buildinfohelper.py
+++ b/lib/bb/ui/buildinfohelper.py
@@ -419,13 +419,24 @@ class ORMWrapper(object):
assert 'name' in layer_information
assert 'layer_index_url' in layer_information
+ # From command line builds we have no brbe as the request is directly
+ # from bitbake
if brbe is None:
- layer_object, _ = Layer.objects.get_or_create(
- name=layer_information['name'],
- layer_index_url=layer_information['layer_index_url'])
+ # If we don't have git commit sha then we're using a non-git
+ # layer so set the layer_source_dir to identify it as such
+ if not layer_information['version']['commit']:
+ local_source_dir = layer_information["local_path"]
+ else:
+ local_source_dir = None
+
+ layer_object, _ = \
+ Layer.objects.get_or_create(
+ name=layer_information['name'],
+ local_source_dir=local_source_dir,
+ layer_index_url=layer_information['layer_index_url'])
+
return layer_object
else:
- # we are under managed mode; we must match the layer used in the Project Layer
br_id, be_id = brbe.split(":")
# find layer by checkout path;
@@ -450,6 +461,11 @@ class ORMWrapper(object):
if brl.layer_version:
return brl.layer_version
+ # This might be a local layer (i.e. no git info) so try
+ # matching local_source_dir
+ if brl.local_source_dir and brl.local_source_dir == layer_information["local_path"]:
+ return brl.layer_version
+
# we matched the BRLayer, but we need the layer_version that generated this BR; reverse of the Project.schedule_build()
#logger.debug(1, "Matched %s to BRlayer %s" % (pformat(layer_information["local_path"]), localdirname))
@@ -974,6 +990,9 @@ class BuildInfoHelper(object):
# we can match to the recipe file path
if path.startswith(lvo.local_path):
return lvo
+ if lvo.layer.local_source_dir and \
+ path.startswith(lvo.layer.local_source_dir):
+ return lvo
#if we get here, we didn't read layers correctly; dump whatever information we have on the error log
logger.warning("Could not match layer version for recipe path %s : %s", path, self.orm_wrapper.layer_version_objects)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list