| Message ID | 46c6bccb-adc0-1e0b-3d2e-5e86ad5f40a1@grenoble.cnrs.fr |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] board/acmesystems/{aria, arietta}-g25: fix genimage.cfg | expand |
Edgar, All, On 2021-08-27 20:22 +0200, Edgar Bonet spake thusly: > On the Aria and the Arietta AT91Bootstrap builds, the file name of the > bootloader embeds its version number, and the genimage configuration > needs this filename in order to build the boot filesystem image. Commit > 0614f435a09e99c33f418a646eaa7647944c2f4c bumped the AT91Bootstrap > version of all acmesystems' boards but failed to update genimage.cfg > accordingly, which broke the builds. The Acqua board is not affected > by this issue. > > Update the affected genimage.cfg with the correct filenames. > > Fixes: > https://gitlab.com/buildroot.org/buildroot/-/jobs/1515521690 > https://gitlab.com/buildroot.org/buildroot/-/jobs/1515521691 > https://gitlab.com/buildroot.org/buildroot/-/jobs/1515521692 > https://gitlab.com/buildroot.org/buildroot/-/jobs/1515521694 > > Signed-off-by: Edgar Bonet <bonet@grenoble.cnrs.fr> Applied to master, thanks. Regards, Yann E. MORIN. > --- > board/acmesystems/aria-g25/genimage.cfg | 2 +- > board/acmesystems/arietta-g25/genimage.cfg | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > Note: I tested the builds but did not test the generated images, for > lack of the appropriate hardware. > > diff --git a/board/acmesystems/aria-g25/genimage.cfg b/board/acmesystems/aria-g25/genimage.cfg > index b40ad9edf3..fd7b9557c6 100644 > --- a/board/acmesystems/aria-g25/genimage.cfg > +++ b/board/acmesystems/aria-g25/genimage.cfg > @@ -11,7 +11,7 @@ image boot.vfat { > } > > file boot.bin { > - image = "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.8.13.bin" > + image = "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.10.3.bin" > } > } > size = 16M > diff --git a/board/acmesystems/arietta-g25/genimage.cfg b/board/acmesystems/arietta-g25/genimage.cfg > index 7c3112dd56..9ab8a6aff5 100644 > --- a/board/acmesystems/arietta-g25/genimage.cfg > +++ b/board/acmesystems/arietta-g25/genimage.cfg > @@ -11,7 +11,7 @@ image boot.vfat { > } > > file boot.bin { > - image = "at91sam9x5_arietta-sdcardboot-linux-zimage-dt-3.8.13.bin" > + image = "at91sam9x5_arietta-sdcardboot-linux-zimage-dt-3.10.3.bin" > } > } > size = 16M > -- > 2.25.1 > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
Edgar, many thanks for your patch. I have successfully tested it on my Arietta G25. Regards, Biagio. Il giorno ven 27 ago 2021 alle ore 21:49 Yann E. MORIN < yann.morin.1998@free.fr> ha scritto: > Edgar, All, > > On 2021-08-27 20:22 +0200, Edgar Bonet spake thusly: > > On the Aria and the Arietta AT91Bootstrap builds, the file name of the > > bootloader embeds its version number, and the genimage configuration > > needs this filename in order to build the boot filesystem image. Commit > > 0614f435a09e99c33f418a646eaa7647944c2f4c bumped the AT91Bootstrap > > version of all acmesystems' boards but failed to update genimage.cfg > > accordingly, which broke the builds. The Acqua board is not affected > > by this issue. > > > > Update the affected genimage.cfg with the correct filenames. > > > > Fixes: > > https://gitlab.com/buildroot.org/buildroot/-/jobs/1515521690 > > https://gitlab.com/buildroot.org/buildroot/-/jobs/1515521691 > > https://gitlab.com/buildroot.org/buildroot/-/jobs/1515521692 > > https://gitlab.com/buildroot.org/buildroot/-/jobs/1515521694 > > > > Signed-off-by: Edgar Bonet <bonet@grenoble.cnrs.fr> > > Applied to master, thanks. > > Regards, > Yann E. MORIN. > > > --- > > board/acmesystems/aria-g25/genimage.cfg | 2 +- > > board/acmesystems/arietta-g25/genimage.cfg | 2 +- > > 2 files changed, 2 insertions(+), 2 deletions(-) > > > > Note: I tested the builds but did not test the generated images, for > > lack of the appropriate hardware. > > > > diff --git a/board/acmesystems/aria-g25/genimage.cfg > b/board/acmesystems/aria-g25/genimage.cfg > > index b40ad9edf3..fd7b9557c6 100644 > > --- a/board/acmesystems/aria-g25/genimage.cfg > > +++ b/board/acmesystems/aria-g25/genimage.cfg > > @@ -11,7 +11,7 @@ image boot.vfat { > > } > > > > file boot.bin { > > - image = > "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.8.13.bin" > > + image = > "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.10.3.bin" > > } > > } > > size = 16M > > diff --git a/board/acmesystems/arietta-g25/genimage.cfg > b/board/acmesystems/arietta-g25/genimage.cfg > > index 7c3112dd56..9ab8a6aff5 100644 > > --- a/board/acmesystems/arietta-g25/genimage.cfg > > +++ b/board/acmesystems/arietta-g25/genimage.cfg > > @@ -11,7 +11,7 @@ image boot.vfat { > > } > > > > file boot.bin { > > - image = > "at91sam9x5_arietta-sdcardboot-linux-zimage-dt-3.8.13.bin" > > + image = > "at91sam9x5_arietta-sdcardboot-linux-zimage-dt-3.10.3.bin" > > } > > } > > size = 16M > > -- > > 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. | > > '------------------------------^-------^------------------^--------------------' >
diff --git a/board/acmesystems/aria-g25/genimage.cfg b/board/acmesystems/aria-g25/genimage.cfg index b40ad9edf3..fd7b9557c6 100644 --- a/board/acmesystems/aria-g25/genimage.cfg +++ b/board/acmesystems/aria-g25/genimage.cfg @@ -11,7 +11,7 @@ image boot.vfat { } file boot.bin { - image = "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.8.13.bin" + image = "at91sam9x5_aria-sdcardboot-linux-zimage-dt-3.10.3.bin" } } size = 16M diff --git a/board/acmesystems/arietta-g25/genimage.cfg b/board/acmesystems/arietta-g25/genimage.cfg index 7c3112dd56..9ab8a6aff5 100644 --- a/board/acmesystems/arietta-g25/genimage.cfg +++ b/board/acmesystems/arietta-g25/genimage.cfg @@ -11,7 +11,7 @@ image boot.vfat { } file boot.bin { - image = "at91sam9x5_arietta-sdcardboot-linux-zimage-dt-3.8.13.bin" + image = "at91sam9x5_arietta-sdcardboot-linux-zimage-dt-3.10.3.bin" } } size = 16M
On the Aria and the Arietta AT91Bootstrap builds, the file name of the bootloader embeds its version number, and the genimage configuration needs this filename in order to build the boot filesystem image. Commit 0614f435a09e99c33f418a646eaa7647944c2f4c bumped the AT91Bootstrap version of all acmesystems' boards but failed to update genimage.cfg accordingly, which broke the builds. The Acqua board is not affected by this issue. Update the affected genimage.cfg with the correct filenames. Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/1515521690 https://gitlab.com/buildroot.org/buildroot/-/jobs/1515521691 https://gitlab.com/buildroot.org/buildroot/-/jobs/1515521692 https://gitlab.com/buildroot.org/buildroot/-/jobs/1515521694 Signed-off-by: Edgar Bonet <bonet@grenoble.cnrs.fr> --- board/acmesystems/aria-g25/genimage.cfg | 2 +- board/acmesystems/arietta-g25/genimage.cfg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Note: I tested the builds but did not test the generated images, for lack of the appropriate hardware.