[PATCH] siggen: Make calc_taskhash match get_taskhash for file checksums

[PATCH] siggen: Make calc_taskhash match get_taskhash for file checksums

[Richard Purdie]

The code in these two functions is meant to be equivlanet in behaviour
but isn't. Add in code to ensure files that don't exist are handled
consistently by both functions. Users did report being able to generate
tracebacks otherwise.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 lib/bb/siggen.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py
index 169756e..f71190a 100644
--- a/lib/bb/siggen.py
+++ b/lib/bb/siggen.py
@@ -667,7 +667,8 @@ def calc_taskhash(sigdata):
         data = data + sigdata['runtaskhashes'][dep]
 
     for c in sigdata['file_checksum_values']:
-        data = data + c[1]
+        if c[1]:
+            data = data + c[1]
 
     if 'taint' in sigdata:
         if 'nostamp:' in sigdata['taint']:
-- 
2.7.4

Re: [PATCH] siggen: Make calc_taskhash match get_taskhash for file checksums

[Matthew McClintock]

Seeing this issue on some older (err, really olderrrr) versions of
bitbake. How far back could we backport?

-M

On Fri, Jun 2, 2017 at 8:02 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> The code in these two functions is meant to be equivlanet in behaviour
> but isn't. Add in code to ensure files that don't exist are handled
> consistently by both functions. Users did report being able to generate
> tracebacks otherwise.
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  lib/bb/siggen.py | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py
> index 169756e..f71190a 100644
> --- a/lib/bb/siggen.py
> +++ b/lib/bb/siggen.py
> @@ -667,7 +667,8 @@ def calc_taskhash(sigdata):
>          data = data + sigdata['runtaskhashes'][dep]
>
>      for c in sigdata['file_checksum_values']:
> -        data = data + c[1]
> +        if c[1]:
> +            data = data + c[1]
>
>      if 'taint' in sigdata:
>          if 'nostamp:' in sigdata['taint']:
> --
> 2.7.4
>
> --
> _______________________________________________
> bitbake-devel mailing list
> bitbake-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/bitbake-devel

Re: [PATCH] siggen: Make calc_taskhash match get_taskhash for file checksums

[akuster808]

On 06/22/2017 02:10 PM, Matthew McClintock wrote:
> Seeing this issue on some older (err, really olderrrr) versions of
> bitbake. How far back could we backport?
Technically 1.34, 1.32 and 1.30 (krogoth). How far back is "olderrrr' ?

- armin
>
> -M
>
> On Fri, Jun 2, 2017 at 8:02 AM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
>> The code in these two functions is meant to be equivlanet in behaviour
>> but isn't. Add in code to ensure files that don't exist are handled
>> consistently by both functions. Users did report being able to generate
>> tracebacks otherwise.
>>
>> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>> ---
>>   lib/bb/siggen.py | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/lib/bb/siggen.py b/lib/bb/siggen.py
>> index 169756e..f71190a 100644
>> --- a/lib/bb/siggen.py
>> +++ b/lib/bb/siggen.py
>> @@ -667,7 +667,8 @@ def calc_taskhash(sigdata):
>>           data = data + sigdata['runtaskhashes'][dep]
>>
>>       for c in sigdata['file_checksum_values']:
>> -        data = data + c[1]
>> +        if c[1]:
>> +            data = data + c[1]
>>
>>       if 'taint' in sigdata:
>>           if 'nostamp:' in sigdata['taint']:
>> --
>> 2.7.4
>>
>> --
>> _______________________________________________
>> bitbake-devel mailing list
>> bitbake-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/bitbake-devel

Re: [PATCH] siggen: Make calc_taskhash match get_taskhash for file checksums

[Matthew McClintock]

On Thu, Jun 22, 2017 at 5:29 PM, akuster808 <akuster808@gmail.com> wrote:
>
>
> On 06/22/2017 02:10 PM, Matthew McClintock wrote:
>>
>> Seeing this issue on some older (err, really olderrrr) versions of
>> bitbake. How far back could we backport?
>
> Technically 1.34, 1.32 and 1.30 (krogoth). How far back is "olderrrr' ?

I guess I'm seeing this on krogoth so that would be good.

-M

Re: [PATCH] siggen: Make calc_taskhash match get_taskhash for file checksums

[Richard Purdie]

On Fri, 2017-06-23 at 09:29 -0500, Matthew McClintock wrote:
> On Thu, Jun 22, 2017 at 5:29 PM, akuster808 <akuster808@gmail.com>
> wrote:
> > On 06/22/2017 02:10 PM, Matthew McClintock wrote:
> > > 
> > > 
> > > Seeing this issue on some older (err, really olderrrr) versions
> > > of
> > > bitbake. How far back could we backport?
> > Technically 1.34, 1.32 and 1.30 (krogoth). How far back is
> > "olderrrr' ?
> I guess I'm seeing this on krogoth so that would be good.

Did backporting the patch fix it? There are a variety of ways you could
hit this error and I want to confirm it was this specific issue you
were hitting...

Cheers,

Richard

Re: [PATCH] siggen: Make calc_taskhash match get_taskhash for file checksums

[Matthew McClintock]

On Fri, Jun 23, 2017 at 9:57 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Fri, 2017-06-23 at 09:29 -0500, Matthew McClintock wrote:
>> On Thu, Jun 22, 2017 at 5:29 PM, akuster808 <akuster808@gmail.com>
>> wrote:
>> > On 06/22/2017 02:10 PM, Matthew McClintock wrote:
>> > >
>> > >
>> > > Seeing this issue on some older (err, really olderrrr) versions
>> > > of
>> > > bitbake. How far back could we backport?
>> > Technically 1.34, 1.32 and 1.30 (krogoth). How far back is
>> > "olderrrr' ?
>> I guess I'm seeing this on krogoth so that would be good.
>
> Did backporting the patch fix it? There are a variety of ways you could
> hit this error and I want to confirm it was this specific issue you
> were hitting...

Yes, we had an identical fix actually.

-M