[openwrt/openwrt] scripts: use sep-char for hash nodes

LEDE Commits lede-commits at lists.infradead.org
Wed Jul 26 06:40:23 PDT 2023


blocktrron pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/5ded0a3975f8757f23d542dae370bca59e4b4525

commit 5ded0a3975f8757f23d542dae370bca59e4b4525
Author: David Bauer <mail at david-bauer.net>
AuthorDate: Fri Jun 9 14:12:47 2023 +0200

    scripts: use sep-char for hash nodes
    
    U-Boot with enabled secure-boot will not boot images with the
    @-character used for hash node-names.
    
    Use the existing separation character configurable for each device.
    
    Signed-off-by: David Bauer <mail at david-bauer.net>
    (cherry picked from commit 2b133ab19cd5d741f3191f917c607667943f5f58)
---
 scripts/mkits.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/mkits.sh b/scripts/mkits.sh
index bd6cddabf4..46ab5ee023 100755
--- a/scripts/mkits.sh
+++ b/scripts/mkits.sh
@@ -103,10 +103,10 @@ if [ -n "${DTB}" ]; then
 			${DTADDR:+load = <${DTADDR}>;}
 			arch = \"${ARCH}\";
 			compression = \"none\";
-			hash at 1 {
+			hash${REFERENCE_CHAR}1 {
 				algo = \"crc32\";
 			};
-			hash at 2 {
+			hash${REFERENCE_CHAR}2 {
 				algo = \"${HASH}\";
 			};
 		};
@@ -123,10 +123,10 @@ if [ -n "${INITRD}" ]; then
 			type = \"ramdisk\";
 			arch = \"${ARCH}\";
 			os = \"linux\";
-			hash at 1 {
+			hash${REFERENCE_CHAR}1 {
 				algo = \"crc32\";
 			};
-			hash at 2 {
+			hash${REFERENCE_CHAR}2 {
 				algo = \"${HASH}\";
 			};
 		};
@@ -145,10 +145,10 @@ if [ -n "${ROOTFS}" ]; then
 			type = \"filesystem\";
 			arch = \"${ARCH}\";
 			compression = \"none\";
-			hash at 1 {
+			hash${REFERENCE_CHAR}1 {
 				algo = \"crc32\";
 			};
-			hash at 2 {
+			hash${REFERENCE_CHAR}2 {
 				algo = \"${HASH}\";
 			};
 		};
@@ -174,10 +174,10 @@ OVCONFIGS=""
 			type = \"flat_dt\";
 			arch = \"${ARCH}\";
 			compression = \"none\";
-			hash at 1 {
+			hash${REFERENCE_CHAR}1 {
 				algo = \"crc32\";
 			};
-			hash at 2 {
+			hash${REFERENCE_CHAR}2 {
 				algo = \"${HASH}\";
 			};
 		};
@@ -209,10 +209,10 @@ DATA="/dts-v1/;
 			compression = \"${COMPRESS}\";
 			load = <${LOAD_ADDR}>;
 			entry = <${ENTRY_ADDR}>;
-			hash at 1 {
+			hash${REFERENCE_CHAR}1 {
 				algo = \"crc32\";
 			};
-			hash at 2 {
+			hash${REFERENCE_CHAR}2 {
 				algo = \"$HASH\";
 			};
 		};




More information about the lede-commits mailing list