kernel-fitimage.bbclass: fix wrong separators
PATCH 1/1 kernel-fitimage.bbclass: fix wrong separators
From: Ming Liu <[email protected]>
Change to use '-' rather than '@' as separators.
--- meta/classes/kernel-fitimage.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
meta/classes/kernel-fitimage.bbclass +4 -4
@@ -217,13 +217,13 @@ fitimage_emit_section_boot_script() { bootscr_sign_keyname="${UBOOT_SIGN_KEYNAME}" cat << EOF >> ${1} - bootscr@${2} { + bootscr-${2} { description = "U-boot script"; data = /incbin/("${3}"); type = "script"; arch = "${UBOOT_ARCH}"; compression = "none"; - hash@1 { + hash-1 { algo = "${bootscr_csum}"; }; };
@@ -232,7 +232,7 @@ EOF if [ "${UBOOT_SIGN_ENABLE}" = "1" -a "${FIT_SIGN_INDIVIDUAL}" = "1" -a -n "${bootscr_sign_keyname}" ] ; then sed -i '$ d' ${1} cat << EOF >> ${1} - signature@1 { + signature-1 { algo = "${bootscr_csum},${bootscr_sign_algo}"; key-name-hint = "${bootscr_sign_keyname}"; };
@@ -383,7 +383,7 @@ fitimage_emit_section_config() { if [ -n "${bootscr_id}" ]; then conf_desc="${conf_desc}${sep}u-boot script" sep=", " - bootscr_line="bootscr = \"bootscr@${bootscr_id}\";" + bootscr_line="bootscr = \"bootscr-${bootscr_id}\";" fi if [ -n "${config_id}" ]; then
Signature · 1 line
2.29.0
Quoted 3 lines · Ming Liu
From: Ming Liu <[email protected]>
Change to use '-' rather than '@' as separators.
Why? The commit message needs more information.
Cheers,
Richard
Quoted 8 lines · Richard Purdie
Quoted 3 lines · Ming Liu
From: Ming Liu <[email protected]>
Change to use '-' rather than '@' as separators.
Why? The commit message needs more information.
I had exactly the same question/comment!
Bruce
Quoted 7 lines
Cheers,
Richard
Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
Quoted 5 lines · Bruce Ashfield
Quoted 2 lines · Richard Purdie
On Fri, 2021-05-21 at 14:20 +0200, Ming Liu wrote:
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
From: Ming Liu <[email protected]>
Change to use '-' rather than '@' as separators.
Why? The commit message needs more information.
I had exactly the same question/comment!
I guess this comes from the attempt to fix CVE-2021-27138, which was already addressed in U-Boot with commit 3f04db891a35 ("image: Check for unit addresses in FITs").
@ is prohibied, so the - should be used instead.
I believe it would throw the build error, somethign like this:
| ./tools/mkimage: verify_header failed for FIT Image support with exit | code 1
I do agree though - commit message should state this reason for this change.
Quoted 19 lines
Bruce
Quoted 7 lines
Cheers,
Richard
--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
Signature · 2 lines
Regards, Andrey.
Hi, Andrey:
Thanks, exactly as you explained, it's to fix CVE-2021-27138, will add more commit messages.
//Ming Liu
Andrey Zhizhikin <[email protected]> 於 2021年5月21日 週五 下午6:04寫道:
Quoted 54 lines
Quoted 5 lines · Bruce Ashfield
Quoted 2 lines · Richard Purdie
On Fri, 2021-05-21 at 14:20 +0200, Ming Liu wrote:
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
From: Ming Liu <[email protected]>
Change to use '-' rather than '@' as separators.
Why? The commit message needs more information.
I had exactly the same question/comment!
I guess this comes from the attempt to fix CVE-2021-27138, which was already addressed in U-Boot with commit
3f04db891a35("image: Check for unit addresses in FITs").
@is prohibied, so the-should be used instead.I believe it would throw the build error, somethign like this:
|./tools/mkimage:verify_headerfailed for FIT Image support with exit | code 1I do agree though - commit message should state this reason for this change.
Quoted 12 lines
Bruce
Quoted 7 lines
Cheers,
Richard
Quoted 7 lines
--
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end
- "Use the force Harry" - Gandalf, Star Trek II--
Regards,
Andrey.