scripts/download.pl: fix downloads with wget

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

diff --git a/scripts/mkits.sh b/scripts/mkits.sh
index 7533baf79999c1f84bc9e1fb61a999aa52cbe395..7bf5681addf097c40e60a93131e6836fdd37a193 100755 (executable)
--- a/scripts/mkits.sh
+++ b/scripts/mkits.sh
@@ -32,12 +32,14 @@ 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-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\t(can be specified more than once)\n"
        exit 1
 }
 
+REFERENCE_CHAR='-'
 FDTNUM=1
 ROOTFSNUM=1
 INITRDNUM=1
@@ -46,7 +48,7 @@ LOADABLES=
 DTOVERLAY=
 DTADDR=
 
-while getopts ":A:a:c:C:D:d:e:f:i:k:n:o:O:v:r:S" OPTION
+while getopts ":A:a:c:C:D:d:e:f:i:k:l:n:o:O:v:r:H:" OPTION
 do
        case $OPTION in
                A ) ARCH=$OPTARG;;
@@ -59,11 +61,12 @@ 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;;
+               H ) HASH=$OPTARG;;
                v ) VERSION=$OPTARG;;
                * ) echo "Invalid option passed to '$0' (options:$*)"
                usage;;
@@ -91,7 +94,7 @@ fi
 # 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}\");
@@ -107,12 +110,12 @@ if [ -n "${DTB}" ]; then
                        };
                };
 "
-       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}\");
@@ -127,14 +130,14 @@ if [ -n "${INITRD}" ]; then
                        };
                };
 "
-       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\");
@@ -149,7 +152,7 @@ if [ -n "${ROOTFS}" ]; then
                        };
                };
 "
-       LOADABLES="${LOADABLES:+$LOADABLES, }\"rootfs-${ROOTFSNUM}\""
+       LOADABLES="${LOADABLES:+$LOADABLES, }\"rootfs${REFERENCE_CHAR}${ROOTFSNUM}\""
 fi
 
 # add DT overlay blobs
@@ -184,8 +187,8 @@ OVCONFIGS=""
 
                config-$ovname {
                        description = \"OpenWrt ${DEVICE} with $ovname\";
-                       kernel = \"kernel-1\";
-                       fdt = \"fdt-$FDTNUM\", \"$ovnode\";
+                       kernel = \"kernel${REFERENCE_CHAR}1\";
+                       fdt = \"fdt${REFERENCE_CHAR}$FDTNUM\", \"$ovnode\";
                        ${LOADABLES:+loadables = ${LOADABLES};}
                        ${COMPATIBLE_PROP}
                        ${INITRD_PROP}
@@ -201,7 +204,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\";
@@ -227,7 +230,7 @@ ${ROOTFS_NODE}
                default = \"${CONFIG}\";
                ${CONFIG} {
                        description = \"OpenWrt ${DEVICE}\";
-                       kernel = \"kernel-1\";
+                       kernel = \"kernel${REFERENCE_CHAR}1\";
                        ${FDT_PROP}
                        ${LOADABLES:+loadables = ${LOADABLES};}
                        ${COMPATIBLE_PROP}