diff options
| author | Alexandru DAMIAN <alexandru.damian@intel.com> | 2015-03-11 14:17:21 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-03-16 17:44:10 +0000 |
| commit | 887c1cb446aa6e5f3d2b0701e5e0d38534253b24 (patch) | |
| tree | e000fd7091a2b3b36c0bfd623ee75db7a2afa163 /bitbake | |
| parent | e4ff3eadfa055b58e1d12cb0b8afc0202d4be3d7 (diff) | |
| download | ast2050-yocto-poky-887c1cb446aa6e5f3d2b0701e5e0d38534253b24.zip ast2050-yocto-poky-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')
| -rw-r--r-- | bitbake/lib/bb/ui/buildinfohelper.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/bitbake/lib/bb/ui/buildinfohelper.py b/bitbake/lib/bb/ui/buildinfohelper.py index ae2ac9f..cf8c444 100644 --- a/bitbake/lib/bb/ui/buildinfohelper.py +++ b/bitbake/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)) |
