[PATCH 0/2] bb: siggen: 2 fixes

[PATCH 0/2] bb: siggen: 2 fixes

[Robert Yang]

The following changes since commit 1ee53881eea3a7ca4d4f6a5ca9c4c6e6488d2348:

  perl: fix yet another race failure (2019-01-14 17:38:24 +0000)

are available in the git repository at:

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

Robert Yang (2):
  bb: siggen: Add a prefix for uuid4
  bb: siggen: Print more info when basehash are mis-matched

 bitbake/lib/bb/build.py  | 2 +-
 bitbake/lib/bb/siggen.py | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

-- 
2.7.4

[PATCH 1/2] bb: siggen: Add a prefix for uuid4

[Robert Yang]

This can make bitbake-diffsigs and dumpsig easier to understand, otherwise,
it's hard to know it is a random uuid unless look into the code.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 bitbake/lib/bb/build.py  | 2 +-
 bitbake/lib/bb/siggen.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bitbake/lib/bb/build.py b/bitbake/lib/bb/build.py
index 3e2a94e..b8f5cd6 100644
--- a/bitbake/lib/bb/build.py
+++ b/bitbake/lib/bb/build.py
@@ -767,7 +767,7 @@ def write_taint(task, d, file_name = None):
     # The specific content of the taint file is not really important,
     # we just need it to be random, so a random UUID is used
     with open(taintfn, 'w') as taintf:
-        taintf.write(str(uuid.uuid4()))
+        taintf.write('uuid4-%s' % str(uuid.uuid4()))
 
 def stampfile(taskname, d, file_name = None, noextra=False):
     """
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index 66aea79..a0ca7e1 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -206,7 +206,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
         if 'nostamp' in taskdep and task in taskdep['nostamp']:
             # Nostamp tasks need an implicit taint so that they force any dependent tasks to run
             import uuid
-            taint = str(uuid.uuid4())
+            taint = 'uuid4-%s' % str(uuid.uuid4())
             data = data + taint
             self.taints[k] = "nostamp:" + taint
 
-- 
2.7.4

[PATCH 2/2] bb: siggen: Print more info when basehash are mis-matched

[Robert Yang]

This is useful for debugging.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 bitbake/lib/bb/siggen.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index a0ca7e1..2d3e4e6 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -119,6 +119,12 @@ class SignatureGeneratorBasic(SignatureGenerator):
             k = fn + "." + task
             if not ignore_mismatch and k in self.basehash and self.basehash[k] != basehash[k]:
                 bb.error("When reparsing %s, the basehash value changed from %s to %s. The metadata is not deterministic and this needs to be fixed." % (k, self.basehash[k], basehash[k]))
+                bb.error("The following commands may help:")
+                cmd = "$ bitbake %s -c%s" % (d.getVar('PN'), task)
+                # Make sure sigdata is dumped before run printdiff
+                bb.error("%s -Snone" % cmd)
+                bb.error("Then:")
+                bb.error("%s -Sprintdiff\n" % cmd)
             self.basehash[k] = basehash[k]
 
         self.taskdeps[fn] = taskdeps
-- 
2.7.4

Re: [PATCH 0/2] bb: siggen: 2 fixes

[Robert Yang]

Ping.

// Robert

On 1/16/19 2:30 PM, Robert Yang wrote:
> The following changes since commit 1ee53881eea3a7ca4d4f6a5ca9c4c6e6488d2348:
> 
>    perl: fix yet another race failure (2019-01-14 17:38:24 +0000)
> 
> are available in the git repository at:
> 
>    git://git.pokylinux.org/poky-contrib rbt/siggen
>    http://git.pokylinux.org/cgit.cgi//log/?h=rbt/siggen
> 
> Robert Yang (2):
>    bb: siggen: Add a prefix for uuid4
>    bb: siggen: Print more info when basehash are mis-matched
> 
>   bitbake/lib/bb/build.py  | 2 +-
>   bitbake/lib/bb/siggen.py | 8 +++++++-
>   2 files changed, 8 insertions(+), 2 deletions(-)
> 

Re: [PATCH 1/2] bb: siggen: Add a prefix for uuid4

[Richard Purdie]

On Wed, 2019-01-16 at 14:30 +0800, Robert Yang wrote:
> This can make bitbake-diffsigs and dumpsig easier to understand,
> otherwise,
> it's hard to know it is a random uuid unless look into the code.

The correct fix for the problem as stated is to tweak the otuput of
diffsigs/dumpsigs, not change the contents of the file...

Cheers,

Richard

Re: [PATCH 1/2] bb: siggen: Add a prefix for uuid4

[Robert Yang]

On 4/8/19 5:01 PM, Richard Purdie wrote:
> On Wed, 2019-01-16 at 14:30 +0800, Robert Yang wrote:
>> This can make bitbake-diffsigs and dumpsig easier to understand,
>> otherwise,
>> it's hard to know it is a random uuid unless look into the code.
> 
> The correct fix for the problem as stated is to tweak the otuput of
> diffsigs/dumpsigs, not change the contents of the file...

Got it, thanks, I will update it.

// Robert

> 
> Cheers,
> 
> Richard
> 
>