From 90f3c2118697b1094736bdc7367a87482660d470 Mon Sep 17 00:00:00 2001 From: John Ripple Date: Thu, 13 Mar 2025 15:05:16 +0000 Subject: fitimage.bbclass: Add missing punctuation 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 Signed-off-by: Khem Raj --- meta-oe/classes/fitimage.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-oe') 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 -- cgit v1.2.3-54-g00ecf