[bitbake-devel] [PATCH 12/17] toasterui: relative recipe paths
Alex DAMIAN
alexandru.damian at intel.com
Thu Mar 12 10:46:45 UTC 2015
From: Alexandru DAMIAN <alexandru.damian at intel.com>
We modify the toasterui to log relative recipe paths
in order to maintain consistency with data fetched from
the layer sources.
Signed-off-by: Alexandru DAMIAN <alexandru.damian at intel.com>
---
lib/bb/ui/buildinfohelper.py | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/bb/ui/buildinfohelper.py b/lib/bb/ui/buildinfohelper.py
index ae2ac9f..cf8c444 100644
--- a/lib/bb/ui/buildinfohelper.py
+++ b/lib/bb/ui/buildinfohelper.py
@@ -221,6 +221,9 @@ class ORMWrapper(object):
assert 'layer_version' in recipe_information
assert 'file_path' in recipe_information
+ if recipe_information['file_path'].startswith(recipe_information['layer_version'].layer.local_path):
+ recipe_information['file_path'] = recipe_information['file_path'][len(recipe_information['layer_version'].layer.local_path):].lstrip("/")
+
recipe_object, created = self._cached_get_or_create(Recipe, layer_version=recipe_information['layer_version'],
file_path=recipe_information['file_path'])
if created and must_exist:
@@ -289,7 +292,10 @@ class ORMWrapper(object):
# we matched the BRLayer, but we need the layer_version that generated this BR; reverse of the Project.schedule_build()
for pl in buildrequest.project.projectlayer_set.filter(layercommit__layer__name = brl.name):
if pl.layercommit.layer.vcs_url == brl.giturl :
- return pl.layercommit.layer
+ layer = pl.layercommit.layer
+ layer.local_path = layer_information['local_path']
+ layer.save()
+ return layer
raise Exception("Unidentified layer %s" % pformat(layer_information))
--
1.9.1
More information about the bitbake-devel
mailing list