netifd: packet_steering: fix shell error on unset steering_flows option

[openwrt/openwrt.git] / scripts / mkits.sh

diff --git a/scripts/mkits.sh b/scripts/mkits.sh
index 58c879cd62da2d2133b10b6d7abf112ade97f8bb..46ab5ee023f54249e41793f9a2ee8ab3a0d0805d 100755 (executable)
--- a/scripts/mkits.sh
+++ b/scripts/mkits.sh
@@ -88,11 +88,6 @@ if [ -n "${COMPATIBLE}" ]; then
        COMPATIBLE_PROP="compatible = \"${COMPATIBLE}\";"
 fi
 
-[ "$DTOVERLAY" ] && {
-       dtbsize=$(wc -c "$DTB" | cut -d' ' -f1)
-       DTADDR=$(printf "0x%08x" $(($LOAD_ADDR - $dtbsize)) )
-}
-
 [ "$FDTADDR" ] && {
        DTADDR="$FDTADDR"
 }
@@ -108,10 +103,10 @@ if [ -n "${DTB}" ]; then
                        ${DTADDR:+load = <${DTADDR}>;}
                        arch = \"${ARCH}\";
                        compression = \"none\";
-                       hash@1 {
+                       hash${REFERENCE_CHAR}1 {
                                algo = \"crc32\";
                        };
-                       hash@2 {
+                       hash${REFERENCE_CHAR}2 {
                                algo = \"${HASH}\";
                        };
                };
@@ -128,10 +123,10 @@ if [ -n "${INITRD}" ]; then
                        type = \"ramdisk\";
                        arch = \"${ARCH}\";
                        os = \"linux\";
-                       hash@1 {
+                       hash${REFERENCE_CHAR}1 {
                                algo = \"crc32\";
                        };
-                       hash@2 {
+                       hash${REFERENCE_CHAR}2 {
                                algo = \"${HASH}\";
                        };
                };
@@ -150,10 +145,10 @@ if [ -n "${ROOTFS}" ]; then
                        type = \"filesystem\";
                        arch = \"${ARCH}\";
                        compression = \"none\";
-                       hash@1 {
+                       hash${REFERENCE_CHAR}1 {
                                algo = \"crc32\";
                        };
-                       hash@2 {
+                       hash${REFERENCE_CHAR}2 {
                                algo = \"${HASH}\";
                        };
                };
@@ -168,9 +163,8 @@ OVCONFIGS=""
        overlay_blob=${overlay##*:}
        ovname=${overlay%%:*}
        ovnode="fdt-$ovname"
-       ovsize=$(wc -c "$overlay_blob" | cut -d' ' -f1)
+       ovsize=$(wc -c "$overlay_blob" | awk '{print $1}')
        echo "$ovname ($overlay_blob) : $ovsize" >&2
-       DTADDR=$(printf "0x%08x" $(($DTADDR - $ovsize)))
        FDTOVERLAY_NODE="$FDTOVERLAY_NODE
 
                $ovnode {
@@ -179,25 +173,21 @@ OVCONFIGS=""
                        data = /incbin/(\"${overlay_blob}\");
                        type = \"flat_dt\";
                        arch = \"${ARCH}\";
-                       load = <${DTADDR}>;
                        compression = \"none\";
-                       hash@1 {
+                       hash${REFERENCE_CHAR}1 {
                                algo = \"crc32\";
                        };
-                       hash@2 {
+                       hash${REFERENCE_CHAR}2 {
                                algo = \"${HASH}\";
                        };
                };
 "
        OVCONFIGS="$OVCONFIGS
 
-               config-$ovname {
-                       description = \"OpenWrt ${DEVICE} with $ovname\";
-                       kernel = \"kernel${REFERENCE_CHAR}1\";
-                       fdt = \"fdt${REFERENCE_CHAR}$FDTNUM\", \"$ovnode\";
-                       ${LOADABLES:+loadables = ${LOADABLES};}
+               $ovname {
+                       description = \"OpenWrt ${DEVICE} overlay $ovname\";
+                       fdt = \"$ovnode\";
                        ${COMPATIBLE_PROP}
-                       ${INITRD_PROP}
                };
        "
 done
@@ -219,10 +209,10 @@ DATA="/dts-v1/;
                        compression = \"${COMPRESS}\";
                        load = <${LOAD_ADDR}>;
                        entry = <${ENTRY_ADDR}>;
-                       hash@1 {
+                       hash${REFERENCE_CHAR}1 {
                                algo = \"crc32\";
                        };
-                       hash@2 {
+                       hash${REFERENCE_CHAR}2 {
                                algo = \"$HASH\";
                        };
                };