package/network/utils/iptables: fix PKG_CPE_ID

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

diff --git a/scripts/mkits.sh b/scripts/mkits.sh
index e5369548d76034e33171cc001de91c9f9abdfccc..46ab5ee023f54249e41793f9a2ee8ab3a0d0805d 100755 (executable)
--- a/scripts/mkits.sh
+++ b/scripts/mkits.sh
@@ -32,17 +32,24 @@ usage() {
        printf "\n\t-d ==> include Device Tree Blob 'dtb'"
        printf "\n\t-r ==> include RootFS blob 'rootfs'"
        printf "\n\t-H ==> specify hash algo instead of SHA1"
-       printf "\n\t-o ==> create output file 'its_file'\n"
+       printf "\n\t-l ==> legacy mode character (@ etc otherwise -)"
+       printf "\n\t-o ==> create output file 'its_file'"
+       printf "\n\t-O ==> create config with dt overlay 'name:dtb'"
+       printf "\n\t-s ==> set FDT load address to 'addr' (hex)"
+       printf "\n\t\t(can be specified more than once)\n"
        exit 1
 }
 
+REFERENCE_CHAR='-'
 FDTNUM=1
 ROOTFSNUM=1
 INITRDNUM=1
 HASH=sha1
 LOADABLES=
+DTOVERLAY=
+DTADDR=
 
-while getopts ":A:a:c:C:D:d:e:f:i:k:n:o:v:r:S" OPTION
+while getopts ":A:a:c:C:D:d:e:f:i:k:l:n:o:O:v:r:s:H:" OPTION
 do
        case $OPTION in
                A ) ARCH=$OPTARG;;
@@ -55,10 +62,13 @@ do
                f ) COMPATIBLE=$OPTARG;;
                i ) INITRD=$OPTARG;;
                k ) KERNEL=$OPTARG;;
+               l ) REFERENCE_CHAR=$OPTARG;;
                n ) FDTNUM=$OPTARG;;
                o ) OUTPUT=$OPTARG;;
+               O ) DTOVERLAY="$DTOVERLAY ${OPTARG}";;
                r ) ROOTFS=$OPTARG;;
-               S ) HASH=$OPTARG;;
+               s ) FDTADDR=$OPTARG;;
+               H ) HASH=$OPTARG;;
                v ) VERSION=$OPTARG;;
                * ) echo "Invalid option passed to '$0' (options:$*)"
                usage;;
@@ -78,69 +88,110 @@ if [ -n "${COMPATIBLE}" ]; then
        COMPATIBLE_PROP="compatible = \"${COMPATIBLE}\";"
 fi
 
+[ "$FDTADDR" ] && {
+       DTADDR="$FDTADDR"
+}
+
 # Conditionally create fdt information
 if [ -n "${DTB}" ]; then
        FDT_NODE="
-               fdt-$FDTNUM {
+               fdt${REFERENCE_CHAR}$FDTNUM {
                        description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device tree blob\";
                        ${COMPATIBLE_PROP}
                        data = /incbin/(\"${DTB}\");
                        type = \"flat_dt\";
+                       ${DTADDR:+load = <${DTADDR}>;}
                        arch = \"${ARCH}\";
                        compression = \"none\";
-                       hash@1 {
+                       hash${REFERENCE_CHAR}1 {
                                algo = \"crc32\";
                        };
-                       hash@2 {
+                       hash${REFERENCE_CHAR}2 {
                                algo = \"${HASH}\";
                        };
                };
 "
-       FDT_PROP="fdt = \"fdt-$FDTNUM\";"
+       FDT_PROP="fdt = \"fdt${REFERENCE_CHAR}$FDTNUM\";"
 fi
 
 if [ -n "${INITRD}" ]; then
        INITRD_NODE="
-               initrd-$INITRDNUM {
+               initrd${REFERENCE_CHAR}$INITRDNUM {
                        description = \"${ARCH_UPPER} OpenWrt ${DEVICE} initrd\";
                        ${COMPATIBLE_PROP}
                        data = /incbin/(\"${INITRD}\");
                        type = \"ramdisk\";
                        arch = \"${ARCH}\";
                        os = \"linux\";
-                       hash@1 {
+                       hash${REFERENCE_CHAR}1 {
                                algo = \"crc32\";
                        };
-                       hash@2 {
+                       hash${REFERENCE_CHAR}2 {
                                algo = \"${HASH}\";
                        };
                };
 "
-       INITRD_PROP="ramdisk=\"initrd-${INITRDNUM}\";"
+       INITRD_PROP="ramdisk=\"initrd${REFERENCE_CHAR}${INITRDNUM}\";"
 fi
 
 
 if [ -n "${ROOTFS}" ]; then
        dd if="${ROOTFS}" of="${ROOTFS}.pagesync" bs=4096 conv=sync
        ROOTFS_NODE="
-               rootfs-$ROOTFSNUM {
+               rootfs${REFERENCE_CHAR}$ROOTFSNUM {
                        description = \"${ARCH_UPPER} OpenWrt ${DEVICE} rootfs\";
                        ${COMPATIBLE_PROP}
                        data = /incbin/(\"${ROOTFS}.pagesync\");
                        type = \"filesystem\";
                        arch = \"${ARCH}\";
                        compression = \"none\";
-                       hash@1 {
+                       hash${REFERENCE_CHAR}1 {
                                algo = \"crc32\";
                        };
-                       hash@2 {
+                       hash${REFERENCE_CHAR}2 {
                                algo = \"${HASH}\";
                        };
                };
 "
-       LOADABLES="${LOADABLES:+$LOADABLES, }\"rootfs-${ROOTFSNUM}\""
+       LOADABLES="${LOADABLES:+$LOADABLES, }\"rootfs${REFERENCE_CHAR}${ROOTFSNUM}\""
 fi
 
+# add DT overlay blobs
+FDTOVERLAY_NODE=""
+OVCONFIGS=""
+[ "$DTOVERLAY" ] && for overlay in $DTOVERLAY ; do
+       overlay_blob=${overlay##*:}
+       ovname=${overlay%%:*}
+       ovnode="fdt-$ovname"
+       ovsize=$(wc -c "$overlay_blob" | awk '{print $1}')
+       echo "$ovname ($overlay_blob) : $ovsize" >&2
+       FDTOVERLAY_NODE="$FDTOVERLAY_NODE
+
+               $ovnode {
+                       description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device tree overlay $ovname\";
+                       ${COMPATIBLE_PROP}
+                       data = /incbin/(\"${overlay_blob}\");
+                       type = \"flat_dt\";
+                       arch = \"${ARCH}\";
+                       compression = \"none\";
+                       hash${REFERENCE_CHAR}1 {
+                               algo = \"crc32\";
+                       };
+                       hash${REFERENCE_CHAR}2 {
+                               algo = \"${HASH}\";
+                       };
+               };
+"
+       OVCONFIGS="$OVCONFIGS
+
+               $ovname {
+                       description = \"OpenWrt ${DEVICE} overlay $ovname\";
+                       fdt = \"$ovnode\";
+                       ${COMPATIBLE_PROP}
+               };
+       "
+done
+
 # Create a default, fully populated DTS file
 DATA="/dts-v1/;
 
@@ -149,7 +200,7 @@ DATA="/dts-v1/;
        #address-cells = <1>;
 
        images {
-               kernel-1 {
+               kernel${REFERENCE_CHAR}1 {
                        description = \"${ARCH_UPPER} OpenWrt Linux-${VERSION}\";
                        data = /incbin/(\"${KERNEL}\");
                        type = \"kernel\";
@@ -158,15 +209,16 @@ 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\";
                        };
                };
 ${INITRD_NODE}
 ${FDT_NODE}
+${FDTOVERLAY_NODE}
 ${ROOTFS_NODE}
        };
 
@@ -174,12 +226,13 @@ ${ROOTFS_NODE}
                default = \"${CONFIG}\";
                ${CONFIG} {
                        description = \"OpenWrt ${DEVICE}\";
-                       kernel = \"kernel-1\";
+                       kernel = \"kernel${REFERENCE_CHAR}1\";
                        ${FDT_PROP}
                        ${LOADABLES:+loadables = ${LOADABLES};}
                        ${COMPATIBLE_PROP}
                        ${INITRD_PROP}
                };
+               ${OVCONFIGS}
        };
 };"