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:44 +0100 |
commit | d193d93422a0ad62aa35b5d4ca5da8d422f72180 (patch) | |
tree | 262ae465fde4af7059b94c08762bcf01cfa11ad6 /lib/bb/siggen.py | |
parent | 89e851fa0403d1e98aeed69990101e3f84f0b283 (diff) | |
download | bitbake-d193d93422a0ad62aa35b5d4ca5da8d422f72180.tar.gz |
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>
Signed-off-by: Jean-Francois Dagenais <jeff.dagenais@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'lib/bb/siggen.py')
-rw-r--r-- | lib/bb/siggen.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py index 4c63b0baa..ad49d1e2a 100644 --- a/lib/bb/siggen.py +++ b/lib/bb/siggen.py @@ -752,7 +752,7 @@ def clean_basepath(a): _, mc, a = a.split(":", 2) b = a.rsplit("/", 2)[1] + '/' + a.rsplit("/", 2)[2] if a.startswith("virtual:"): - b = b + ":" + a.rsplit(":", 1)[0] + b = b + ":" + a.rsplit(":", 2)[0] if mc: b = b + ":mc:" + mc return b |