diff options
author | Jean-Francois Dagenais <jeff.dagenais@gmail.com> | 2020-08-20 17:50:00 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-08-22 15:47:53 +0100 |
commit | c21ed39046961fbf52dd356a4edf24186e8b0f57 (patch) | |
tree | d9f9176c51731b876a243709d8842d1c111f9ae1 /bitbake/lib | |
parent | 15d3931fb419bb13ee3d516e0a8ce2ef287aff96 (diff) | |
download | poky-c21ed39046961fbf52dd356a4edf24186e8b0f57.tar.gz |
bitbake: siggen: clean_basepath: remove recipe full path when virtual:xyz present
Before this fix, this example basepath (a):
virtual:native:/full/path/to/recipes-example/helloworld/helloworld_1.2.3.bb:do_compile
would get incorrectly "cleaned" into:
helloworld/helloworld_1.2.3.bb:do_compile:virtual:native:/full/path/to/recipes-example/helloworld/helloworld_1.2.3.bb
When searching backwards in `a` trying to isolate the 'virtual:xyz' to add
it to the end of the string, we need to consider `a` still has the recipe
path and taskname. So stoping the rsplit after only 1 split is not enough.
We want to reach the second ':' from the end.
This way, we obtain:
helloworld/helloworld_1.2.3.bb:do_compile:virtual:native
reviewed-by: Maxime Roussin-BĂ©langer <maxime.roussinbelanger@gmail.com>
(Bitbake rev: d193d93422a0ad62aa35b5d4ca5da8d422f72180)
Signed-off-by: Jean-Francois Dagenais <jeff.dagenais@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/siggen.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py index 4c63b0baad..ad49d1e2aa 100644 --- a/bitbake/lib/bb/siggen.py +++ b/bitbake/lib/bb/siggen.py | |||
@@ -752,7 +752,7 @@ def clean_basepath(a): | |||
752 | _, mc, a = a.split(":", 2) | 752 | _, mc, a = a.split(":", 2) |
753 | b = a.rsplit("/", 2)[1] + '/' + a.rsplit("/", 2)[2] | 753 | b = a.rsplit("/", 2)[1] + '/' + a.rsplit("/", 2)[2] |
754 | if a.startswith("virtual:"): | 754 | if a.startswith("virtual:"): |
755 | b = b + ":" + a.rsplit(":", 1)[0] | 755 | b = b + ":" + a.rsplit(":", 2)[0] |
756 | if mc: | 756 | if mc: |
757 | b = b + ":mc:" + mc | 757 | b = b + ":mc:" + mc |
758 | return b | 758 | return b |