Skip to contentSkip to conversation

siggen.py: fix clean_basepath()

PATCH In review Robert Yang 2 participants 4 messages Sep 24, 2015 – Sep 29, 2015

lore
Share & tools
lore
#0 lore raw

cover siggen.py: fix clean_basepath()

The following changes since commit 9f66aa1a11b5b45280aa41bf4517ec56ee5f2ab2:

bitbake: toaster: start script warning text formatting small improvement (2015-09-23 22:44:56 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib rbt/sig
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/sig

Robert Yang (1):
siggen.py: fix clean_basepath()

 bitbake/lib/bb/siggen.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 siggen.py: fix clean_basepath()

Fixed:

$ bitbake-diffsigs tmp/stamps/x86_64-linux/quilt-native/0.64-r0.do_patch.sigdata.foo tmp/stamps/x86_64-linux/quilt-native/0.64-r0.do_fetch.sigdata.foo
[snip]
runtaskdeps changed from ['quiltquilt-native_0.64.bb.do_unpack'] to []

Note the "quiltquilt-native".

---
 bitbake/lib/bb/siggen.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
bitbake/lib/bb/siggen.py +1 -1
index 2985272..46fd2fc 100644
@@ -303,7 +303,7 @@ def dump_this_task(outfile, d):
     bb.parse.siggen.dump_sigtask(fn, task, outfile, "customfile")
 
 def clean_basepath(a):
-    b = a.rsplit("/", 2)[1] + a.rsplit("/", 2)[2]
+    b = a.rsplit("/", 2)[2]
     if a.startswith("virtual:"):
         b = b + ":" + a.rsplit(":", 1)[0]
     return b
Signature · 1 line
1.7.9.5
#2 lore raw
In reply to Robert Yang

Hi RP,

I'm not sure what patch causes this problem, this patch can fix it, but I'm not sure whether it is a correct fix or not.

// Robert

Quoted 15 lines · Robert Yang

The following changes since commit 9f66aa1a11b5b45280aa41bf4517ec56ee5f2ab2:

bitbake: toaster: start script warning text formatting small improvement (2015-09-23 22:44:56 +0100)

are available in the git repository at:

git://git.pokylinux.org/poky-contrib rbt/sig
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/sig

Robert Yang (1):
siggen.py: fix clean_basepath()

  bitbake/lib/bb/siggen.py |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
#3 lore raw
Quoted 4 lines · Robert Yang

Hi RP,

I'm not sure what patch causes this problem, this patch can fix it, but I'm not sure whether it is a correct fix or not.

The code there is quite deliberately adding this in. The issue is around shared workdir and shared stamps that we had for gcc in particular. Without this, we used to get stamp mismatches reported for gcc unpack/fetch/patch tasks.

That said, I think the shared stamps code was a bad idea, we've stopped using it for gcc now (gcc-source is there instead) and we should probably remove all remnants of stamp-base from bitbake as it turned out to be a bad idea.

I'd probably leave fixing this until we do that.

Cheers,

Richard