| Message ID | 86d5deb9-b0d8-b655-21b6-0f1f3a3f1f96@grenoble.cnrs.fr |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] boot/at91bootstrap3: fix checksum of license | expand |
Edgar, All, On 2021-03-07 20:45 +0100, Edgar Bonet spake thusly: > Commit ca1604388a86d73c548c6e65eadd13f424685838 updated the checksum of > the tarball, but failed to update the one of main.c, which serves as a > license file. > > Signed-off-by: Edgar Bonet <bonet@grenoble.cnrs.fr> Applied to next, thanks. Regards, Yann E. MORIN. > --- > boot/at91bootstrap3/at91bootstrap3.hash | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/boot/at91bootstrap3/at91bootstrap3.hash b/boot/at91bootstrap3/at91bootstrap3.hash > index 6671a4ac70..6b6257b0ab 100644 > --- a/boot/at91bootstrap3/at91bootstrap3.hash > +++ b/boot/at91bootstrap3/at91bootstrap3.hash > @@ -1,3 +1,3 @@ > # Locally calculated > sha256 dd6a3c57c1c84fc3b18187bee3d139146a0e032dd1d8edea7b242730e0bc4fe1 at91bootstrap3-v3.9.3.tar.gz > -sha256 732b2a55b5905031d8ae420136ffb5f8889214865784386bf754cffab8d2bc6e main.c > +sha256 fd7a1ce5719bb7abf5e289da2e0ea8c933af3ba0f6ad03dbdbd2b7f54a77498a main.c > -- > 2.25.1 > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
Edgar, All, On 2021-03-07 21:44 +0100, Yann E. MORIN spake thusly: > On 2021-03-07 20:45 +0100, Edgar Bonet spake thusly: > > Commit ca1604388a86d73c548c6e65eadd13f424685838 updated the checksum of > > the tarball, but failed to update the one of main.c, which serves as a > > license file. > > > > Signed-off-by: Edgar Bonet <bonet@grenoble.cnrs.fr> > Applied to next, thanks. Not a big deal, but in fact, the real commit that forgot to update the hash was commit f379e75dcd80 (boot/at91bootstrap3: bump to version 3.9.2), not ca1604388a86 as you mention. But I forgot to amend the commit before pushing, damn me... Regards, Yann E. MORIN. > > --- > > boot/at91bootstrap3/at91bootstrap3.hash | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/boot/at91bootstrap3/at91bootstrap3.hash b/boot/at91bootstrap3/at91bootstrap3.hash > > index 6671a4ac70..6b6257b0ab 100644 > > --- a/boot/at91bootstrap3/at91bootstrap3.hash > > +++ b/boot/at91bootstrap3/at91bootstrap3.hash > > @@ -1,3 +1,3 @@ > > # Locally calculated > > sha256 dd6a3c57c1c84fc3b18187bee3d139146a0e032dd1d8edea7b242730e0bc4fe1 at91bootstrap3-v3.9.3.tar.gz > > -sha256 732b2a55b5905031d8ae420136ffb5f8889214865784386bf754cffab8d2bc6e main.c > > +sha256 fd7a1ce5719bb7abf5e289da2e0ea8c933af3ba0f6ad03dbdbd2b7f54a77498a main.c > > -- > > 2.25.1 > > _______________________________________________ > > buildroot mailing list > > buildroot@busybox.net > > http://lists.busybox.net/mailman/listinfo/buildroot > > -- > .-----------------.--------------------.------------------.--------------------. > | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | > | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | > | +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no | > | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | > '------------------------------^-------^------------------^--------------------' > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
Hi! Yann E. MORIN wrote: > Not a big deal, but in fact, the real commit that forgot to update the > hash was commit f379e75dcd80 (boot/at91bootstrap3: bump to version > 3.9.2), not ca1604388a86 as you mention. Oops, sorry. Well, actually both f379e75dcd80 and ca1604388a86 bumped the version of at91bootstrap3, and both forgot to update the hash of main.c. Regards, Edgar Bonet.
Edgar, All, On 2021-03-07 22:08 +0100, Edgar Bonet spake thusly: > Yann E. MORIN wrote: > > Not a big deal, but in fact, the real commit that forgot to update the > > hash was commit f379e75dcd80 (boot/at91bootstrap3: bump to version > > 3.9.2), not ca1604388a86 as you mention. > Oops, sorry. Hehe, no biggy, no biggy. :-) > Well, actually both f379e75dcd80 and ca1604388a86 bumped the version of > at91bootstrap3, and both forgot to update the hash of main.c. Indeed, both submitters forgot to check legal-info. ;-) But when I tried to review the changes in main.c between 3.9.2. and 3.9.3 (to assess if there was a change in licensing terms), I found no delta. So, the bump to 3.9.3 did not forget to update the hash: in all theory, there would have been no update to do since main.c had not changed. main.c last changed between 3.9.0 and 3.9.2, so the real culprit for forgetting to update the hash was really the first bump. But now this is nit-picking. ;-) Regards, Yann E. MORIN. > Regards, > > Edgar Bonet. > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
>>>>> "Edgar" == Edgar Bonet <bonet@grenoble.cnrs.fr> writes: > Commit ca1604388a86d73c548c6e65eadd13f424685838 updated the checksum of > the tarball, but failed to update the one of main.c, which serves as a > license file. > Signed-off-by: Edgar Bonet <bonet@grenoble.cnrs.fr> Committed to 2021.02.x and 2020.11.x, thanks.
diff --git a/boot/at91bootstrap3/at91bootstrap3.hash b/boot/at91bootstrap3/at91bootstrap3.hash index 6671a4ac70..6b6257b0ab 100644 --- a/boot/at91bootstrap3/at91bootstrap3.hash +++ b/boot/at91bootstrap3/at91bootstrap3.hash @@ -1,3 +1,3 @@ # Locally calculated sha256 dd6a3c57c1c84fc3b18187bee3d139146a0e032dd1d8edea7b242730e0bc4fe1 at91bootstrap3-v3.9.3.tar.gz -sha256 732b2a55b5905031d8ae420136ffb5f8889214865784386bf754cffab8d2bc6e main.c +sha256 fd7a1ce5719bb7abf5e289da2e0ea8c933af3ba0f6ad03dbdbd2b7f54a77498a main.c
Commit ca1604388a86d73c548c6e65eadd13f424685838 updated the checksum of the tarball, but failed to update the one of main.c, which serves as a license file. Signed-off-by: Edgar Bonet <bonet@grenoble.cnrs.fr> --- boot/at91bootstrap3/at91bootstrap3.hash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)