Skip to contentSkip to conversation

uboot-sign: Fix index error in concat_dtb_helper() with multiple configs

PATCH Superseded Florian Amstutz 3 participants 3 messages Jul 2, 2024

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 uboot-sign: Fix index error in concat_dtb_helper() with multiple configs

Since j is not unset after the inner loop, the image will only be copied for the first configuration.

---
meta/classes/uboot-sign.bbclass | 5 +++--

1 file changed, 3 insertions(+), 2 deletions(-)
meta/classes/uboot-sign.bbclass +0 -0
index 6bb4ddc600..5b75c8a3b0 100644
@@ -137,8 +137,7 @@ concat_dtb_helper() {
 

if [ -n "${UBOOT_CONFIG}" ]
then
-                               i=0
-                               j=0
+                               unset i j
for config in ${UBOOT_MACHINE}; do
i=$(expr $i + 1);
for type in ${UBOOT_CONFIG}; do
@@ -148,7 +147,9 @@ concat_dtb_helper() {
cp ${UBOOT_IMAGE} ${B}/${CONFIG_B_PATH}/u-boot-$type.${UBOOT_SUFFIX}
fi
done
+                                       unset j
done
+                               unset i
fi
else
bbwarn "Failure while adding public key to u-boot binary. Verified boot won't be available." --
2.34.1

#1 lore raw

Patchtest results for [kirkstone][PATCH] uboot-sign: Fix index error in concat_dtb_helper() with multiple configs

Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:

---
Testing patch /home/patchtest/share/mboxes/kirkstone-uboot-sign-Fix-index-error-in-concat_dtb_helper-with-multiple-configs.patch

FAIL: test mbox format: Series has malformed diff lines. Create the series again using git-format-patch and ensure it applies using git am (test_mbox.TestMbox.test_mbox_format)

PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test max line length (test_metadata.TestMetadata.test_max_line_length)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)

SKIP: pretest pylint: Python-unidiff parse error (test_python_pylint.PyLint.pretest_pylint)
SKIP: pretest src uri left files: Patch cannot be merged (test_metadata.TestMetadata.pretest_src_uri_left_files)
SKIP: test CVE check ignore: No modified recipes or older target branch, skipping test (test_metadata.TestMetadata.test_cve_check_ignore)
SKIP: test CVE tag format: Parse error Hunk diff line expected: if [ -n "${UBOOT_CONFIG}" ]
SKIP: test Signed-off-by presence: Parse error Hunk diff line expected: if [ -n "${UBOOT_CONFIG}" ]
SKIP: test Upstream-Status presence: Parse error Hunk diff line expected: if [ -n "${UBOOT_CONFIG}" ]
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum modified not mentioned: No modified recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: Python-unidiff parse error (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test src uri left files: Patch cannot be merged (test_metadata.TestMetadata.test_src_uri_left_files)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)

---

Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!

#2 lore raw
In reply to Florian Amstutz

Hi Florian,

Quoted 15 lines · Florian Amstutz via lists.openembedded.org

You don't often get email from [email protected]. Learn why this is important<https://aka.ms/LearnAboutSenderIdentification> Since j is not unset after the inner loop, the image will only be copied
for the first configuration.

---
  meta/classes/uboot-sign.bbclass | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
meta/classes/uboot-sign.bbclass +0 -0
index 6bb4ddc600..5b75c8a3b0 100644

meta/classes/uboot-sign.bbclass concat_dtb_helper() { · line 140

Quoted 6 lines
meta/classes/uboot-sign.bbclass +1 -2
@@ -137,8 +137,7 @@ concat_dtb_helper() {
 
                         if [ -n "${UBOOT_CONFIG}" ]
                         then
-                               i=0
-                               j=0
+                               unset i j

What about only unsetting i and j wherever actually needed?

I.e.

unset i

here

meta/classes/uboot-sign.bbclass concat_dtb_helper() { · line 142

Quoted 2 lines
meta/classes/uboot-sign.bbclass +0 -0
                                 for config in ${UBOOT_MACHINE}; do
                                         i=$(expr $i + 1);

unset j

here

meta/classes/uboot-sign.bbclass concat_dtb_helper() { · line 147

Quoted 3 lines
meta/classes/uboot-sign.bbclass +0 -0
                                         for type in ${UBOOT_CONFIG}; do
@@ -148,7 +147,9 @@ concat_dtb_helper() {
                                                         cp ${UBOOT_IMAGE} ${B}/${CONFIG_B_PATH}/u-boot-$type.${UBOOT_SUFFIX}

Breaking here would make a lot of (/more?) sense, we're otherwise looping unnecessarily.

Cheers,
Quentin