diff mbox series

[meta-oe] fitimage.bbclass: Add missing punctuation

Message ID NNse.1741811441373566415.sSfB@lists.openembedded.org
State New
Headers show
Series [meta-oe] fitimage.bbclass: Add missing punctuation | expand

Commit Message

John Ripple March 12, 2025, 8:30 p.m. UTC
The functions related to signing the fitimage had missing quotations and
newlines. Without this punctuation, the signing class would fail to
generate a signed fitimage.
To test this change just create a fitImage using this class and set
FITIMAGE_SIGN to 1. The resulting fitImage its file should have one
property per line with quotes around the property values.
Signed-off-by: John Ripple <john.ripple@keysight.com>
---
meta-oe/classes/fitimage.bbclass | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Khem Raj March 12, 2025, 8:47 p.m. UTC | #1
Thanks for your submission John, but
patch is corrupted somehow

Applying: fitimage.bbclass: Add missing punctuation
error: corrupt patch at line 10


On Wed, Mar 12, 2025 at 1:30 PM John Ripple via lists.openembedded.org
<john.ripple=keysight.com@lists.openembedded.org> wrote:
>
> The functions related to signing the fitimage had missing quotations and
> newlines. Without this punctuation, the signing class would fail to
> generate a signed fitimage.
> To test this change just create a fitImage using this class and set
> FITIMAGE_SIGN to 1. The resulting fitImage its file should have one
> property per line with quotes around the property values.
> Signed-off-by: John Ripple <john.ripple@keysight.com>
> ---
>  meta-oe/classes/fitimage.bbclass | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> diff --git a/meta-oe/classes/fitimage.bbclass b/meta-oe/classes/fitimage.bbclass
> index fef8974187..03c01a1ed3 100644
> --- a/meta-oe/classes/fitimage.bbclass
> +++ b/meta-oe/classes/fitimage.bbclass
> @@ -276,7 +276,7 @@ def fitimage_emit_subsection_signature(d, fd, sign_images_list):
>      fd.write('\t\t\tsignature-1 {\n')
>      fd.write(f'\t\t\t\talgo = "{hash_algo},{encrypt_algo}";\n')
>      if conf_sign_keyname:
> -        fd.write(f'\t\t\t\tkey-name-hint = {conf_sign_keyname}";\n')
> +        fd.write(f'\t\t\t\tkey-name-hint = "{conf_sign_keyname}";\n')
>      fd.write(f'\t\t\t\tsign-images = {sign_images};\n')
>      fd.write(f'\t\t\t\tsigner-name = "{signer_name}";\n')
>      fd.write(f'\t\t\t\tsigner-version = "{signer_version}";\n')
> @@ -341,9 +341,9 @@ def fitimage_emit_section_config_fdto(d, fd, dtb, compatible):
>
>      fd.write(f'\t\t{dtb} {{\n')
>      fd.write(f'\t\t\tdescription = "Device Tree Overlay";\n')
> -    fd.write(f'\t\t\tfdt = "fdt-{dtb}";')
> +    fd.write(f'\t\t\tfdt = "fdt-{dtb}";\n')
>      if compatible:
> -       fd.write(f'\t\t\tcompatible = "{compatible}";')
> +       fd.write(f'\t\t\tcompatible = "{compatible}";\n')
>
>      if sign == "1":
>          sign_images = ["fdt"]
> @@ -493,7 +493,7 @@ do_configure[postfuncs] += "write_manifest"
>  do_fitimage () {
>      if [ "${FITIMAGE_SIGN}" = "1" ]; then
>          uboot-mkimage ${FITIMAGE_MKIMAGE_EXTRA_ARGS} \
> -            -k ${FITIMAGE_SIGN_KEYDIR} -r \
> +            -k "${FITIMAGE_SIGN_KEYDIR}" -r \
>              -f "${B}/manifest.its" \
>              "${B}/fitImage"
>      else
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#115942): https://lists.openembedded.org/g/openembedded-devel/message/115942
> Mute This Topic: https://lists.openembedded.org/mt/111667776/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta-oe/classes/fitimage.bbclass b/meta-oe/classes/fitimage.bbclass
index fef8974187..03c01a1ed3 100644
--- a/meta-oe/classes/fitimage.bbclass
+++ b/meta-oe/classes/fitimage.bbclass
@@ -276,7 +276,7 @@  def fitimage_emit_subsection_signature(d, fd, sign_images_list):
fd.write('\t\t\tsignature-1 {\n')
fd.write(f'\t\t\t\talgo = "{hash_algo},{encrypt_algo}";\n')
if conf_sign_keyname:
-        fd.write(f'\t\t\t\tkey-name-hint = {conf_sign_keyname}";\n')
+        fd.write(f'\t\t\t\tkey-name-hint = "{conf_sign_keyname}";\n')
fd.write(f'\t\t\t\tsign-images = {sign_images};\n')
fd.write(f'\t\t\t\tsigner-name = "{signer_name}";\n')
fd.write(f'\t\t\t\tsigner-version = "{signer_version}";\n')
@@ -341,9 +341,9 @@  def fitimage_emit_section_config_fdto(d, fd, dtb, compatible):

fd.write(f'\t\t{dtb} {{\n')
fd.write(f'\t\t\tdescription = "Device Tree Overlay";\n')
-    fd.write(f'\t\t\tfdt = "fdt-{dtb}";')
+    fd.write(f'\t\t\tfdt = "fdt-{dtb}";\n')
if compatible:
-       fd.write(f'\t\t\tcompatible = "{compatible}";')
+       fd.write(f'\t\t\tcompatible = "{compatible}";\n')

if sign == "1":
sign_images = ["fdt"]
@@ -493,7 +493,7 @@  do_configure[postfuncs] += "write_manifest"
do_fitimage () {
if [ "${FITIMAGE_SIGN}" = "1" ]; then
uboot-mkimage ${FITIMAGE_MKIMAGE_EXTRA_ARGS} \
-            -k ${FITIMAGE_SIGN_KEYDIR} -r \
+            -k "${FITIMAGE_SIGN_KEYDIR}" -r \
-f "${B}/manifest.its" \
"${B}/fitImage"
else