summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb/ui
diff options
context:
space:
mode:
authorAlexandru DAMIAN <alexandru.damian@intel.com>2015-03-11 14:17:21 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-03-16 17:44:10 +0000
commit887c1cb446aa6e5f3d2b0701e5e0d38534253b24 (patch)
treee000fd7091a2b3b36c0bfd623ee75db7a2afa163 /bitbake/lib/bb/ui
parente4ff3eadfa055b58e1d12cb0b8afc0202d4be3d7 (diff)
downloadpoky-887c1cb446aa6e5f3d2b0701e5e0d38534253b24.tar.gz
bitbake: toasterui: relative recipe paths
We modify the toasterui to log relative recipe paths in order to maintain consistency with data fetched from the layer sources. (Bitbake rev: 253d69e88fd68729196ad43c15e8733527d76198) Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/ui')
-rw-r--r--bitbake/lib/bb/ui/buildinfohelper.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py
index ae2ac9fee5..cf8c444fdf 100644
--- a/bitbake/lib/bb/ui/buildinfohelper.py
+++ b/bitbake/lib/bb/ui/buildinfohelper.py
@@ -221,6 +221,9 @@ class ORMWrapper(object):
221 assert 'layer_version' in recipe_information 221 assert 'layer_version' in recipe_information
222 assert 'file_path' in recipe_information 222 assert 'file_path' in recipe_information
223 223
224 if recipe_information['file_path'].startswith(recipe_information['layer_version'].layer.local_path):
225 recipe_information['file_path'] = recipe_information['file_path'][len(recipe_information['layer_version'].layer.local_path):].lstrip("/")
226
224 recipe_object, created = self._cached_get_or_create(Recipe, layer_version=recipe_information['layer_version'], 227 recipe_object, created = self._cached_get_or_create(Recipe, layer_version=recipe_information['layer_version'],
225 file_path=recipe_information['file_path']) 228 file_path=recipe_information['file_path'])
226 if created and must_exist: 229 if created and must_exist:
@@ -289,7 +292,10 @@ class ORMWrapper(object):
289 # we matched the BRLayer, but we need the layer_version that generated this BR; reverse of the Project.schedule_build() 292 # we matched the BRLayer, but we need the layer_version that generated this BR; reverse of the Project.schedule_build()
290 for pl in buildrequest.project.projectlayer_set.filter(layercommit__layer__name = brl.name): 293 for pl in buildrequest.project.projectlayer_set.filter(layercommit__layer__name = brl.name):
291 if pl.layercommit.layer.vcs_url == brl.giturl : 294 if pl.layercommit.layer.vcs_url == brl.giturl :
292 return pl.layercommit.layer 295 layer = pl.layercommit.layer
296 layer.local_path = layer_information['local_path']
297 layer.save()
298 return layer
293 299
294 raise Exception("Unidentified layer %s" % pformat(layer_information)) 300 raise Exception("Unidentified layer %s" % pformat(layer_information))
295 301