| Message ID | 20240503151827.1387077-1-ralph.siemsen@linaro.org |
|---|---|
| State | Accepted, archived |
| Commit | 2d338548a4b745a71eaf6c29231adc93c4165778 |
| Headers | show |
| Series | uboot-sign: fix loop in do_uboot_assemble_fitimage | expand |
On 5/3/24 11:18, Ralph Siemsen wrote: > When using multiple u-boot configurations in UBOOT_CONFIG, the helper > function uboot_assemble_fitimage_helper() was not called with all > combinations of type & binary, due to a copy-n-paste indexing error. > > Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org> > --- > meta/classes-recipe/uboot-sign.bbclass | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/classes-recipe/uboot-sign.bbclass b/meta/classes-recipe/uboot-sign.bbclass > index 7a0b8047e4..c8e097f2f2 100644 > --- a/meta/classes-recipe/uboot-sign.bbclass > +++ b/meta/classes-recipe/uboot-sign.bbclass > @@ -367,7 +367,7 @@ do_uboot_assemble_fitimage() { > done > > for binary in ${UBOOT_BINARIES}; do > - k=$(expr $j + 1); > + k=$(expr $k + 1); > if [ $k -eq $i ]; then > break; > fi Reviewed-by: Sean Anderson <sean.anderson@seco.com> [Clea Astarte Google Cloud, SECO SpA]<https://clea.ai/astarte-on-google-cloud>
Hi Ralph, On 5/3/24 5:18 PM, Ralph Siemsen via lists.openembedded.org wrote: > [You don't often get email from ralph.siemsen=linaro.org@lists.openembedded.org. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ] > > When using multiple u-boot configurations in UBOOT_CONFIG, the helper > function uboot_assemble_fitimage_helper() was not called with all > combinations of type & binary, due to a copy-n-paste indexing error. > > Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org> Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de> This likely fulfills the conditions for backporting to older branches, so adding Steve in Cc. Thanks! Quentin
On Fri, May 3, 2024 at 9:44 AM Quentin Schulz <quentin.schulz@cherry.de> wrote: > > Hi Ralph, > > On 5/3/24 5:18 PM, Ralph Siemsen via lists.openembedded.org wrote: > > [You don't often get email from ralph.siemsen=linaro.org@lists.openembedded.org. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ] > > > > When using multiple u-boot configurations in UBOOT_CONFIG, the helper > > function uboot_assemble_fitimage_helper() was not called with all > > combinations of type & binary, due to a copy-n-paste indexing error. > > > > Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org> > > Reviewed-by: Quentin Schulz <quentin.schulz@cherry.de> > > This likely fulfills the conditions for backporting to older branches, > so adding Steve in Cc. Please submit a kirkstone patch once this hits the master branch. Steve
On Fri, May 3, 2024 at 1:36 PM Steve Sakoman <steve@sakoman.com> wrote: > > Please submit a kirkstone patch once this hits the master branch. Ack. I have been checking daily on master and master-next, but so far it does not seem to have been picked up. It is a clean cherry-pick into kirkstone, so at least that part should be simple ;-) Regards, Ralph
On Tue, May 7, 2024 at 4:50 PM Ralph Siemsen via lists.openembedded.org <ralph.siemsen=linaro.org@lists.openembedded.org> wrote: > > On Fri, May 3, 2024 at 1:36 PM Steve Sakoman <steve@sakoman.com> wrote: > > > > Please submit a kirkstone patch once this hits the master branch. I've just sent a patch for scarthgap, clean cherry-picked from master. The same patch also works for nanbield. No change is necessary on kirsksone, as it does not contain the problematic line. Ralph
diff --git a/meta/classes-recipe/uboot-sign.bbclass b/meta/classes-recipe/uboot-sign.bbclass index 7a0b8047e4..c8e097f2f2 100644 --- a/meta/classes-recipe/uboot-sign.bbclass +++ b/meta/classes-recipe/uboot-sign.bbclass @@ -367,7 +367,7 @@ do_uboot_assemble_fitimage() { done for binary in ${UBOOT_BINARIES}; do - k=$(expr $j + 1); + k=$(expr $k + 1); if [ $k -eq $i ]; then break; fi
When using multiple u-boot configurations in UBOOT_CONFIG, the helper function uboot_assemble_fitimage_helper() was not called with all combinations of type & binary, due to a copy-n-paste indexing error. Signed-off-by: Ralph Siemsen <ralph.siemsen@linaro.org> --- meta/classes-recipe/uboot-sign.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)