ppp: backport security fixes

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

diff --git a/scripts/mkits.sh b/scripts/mkits.sh
index 6b5100e1a2ac9d84a703700aaa3e1491ffcf7cd9..93c8cedaed5d20d4d74cad529119fb75b3fbfb83 100755 (executable)
--- a/scripts/mkits.sh
+++ b/scripts/mkits.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Licensed under the terms of the GNU GPL License version 2 or later.
 #
@@ -19,6 +19,7 @@ usage() {
                "-v version -k kernel [-D name -d dtb] -o its_file"
        echo -e "\t-A ==> set architecture to 'arch'"
        echo -e "\t-C ==> set compression type 'comp'"
+       echo -e "\t-c ==> set config name 'config'"
        echo -e "\t-a ==> set load address to 'addr' (hex)"
        echo -e "\t-e ==> set entry point to 'entry' (hex)"
        echo -e "\t-v ==> set kernel version to 'version'"
@@ -29,11 +30,12 @@ usage() {
        exit 1
 }
 
-while getopts ":A:a:C:D:d:e:k:o:v:" OPTION
+while getopts ":A:a:c:C:D:d:e:k:o:v:" OPTION
 do
        case $OPTION in
                A ) ARCH=$OPTARG;;
                a ) LOAD_ADDR=$OPTARG;;
+               c ) CONFIG=$OPTARG;;
                C ) COMPRESS=$OPTARG;;
                D ) DEVICE=$OPTARG;;
                d ) DTB=$OPTARG;;
@@ -49,7 +51,7 @@ done
 # Make sure user entered all required parameters
 if [ -z "${ARCH}" ] || [ -z "${COMPRESS}" ] || [ -z "${LOAD_ADDR}" ] || \
        [ -z "${ENTRY_ADDR}" ] || [ -z "${VERSION}" ] || [ -z "${KERNEL}" ] || \
-       [ -z "${OUTPUT}" ]; then
+       [ -z "${OUTPUT}" ] || [ -z "${CONFIG}" ]; then
        usage
 fi
 
@@ -57,7 +59,7 @@ ARCH_UPPER=`echo $ARCH | tr '[:lower:]' '[:upper:]'`
 
 # Conditionally create fdt information
 if [ -n "${DTB}" ]; then
-       FDT="
+       FDT_NODE="
                fdt@1 {
                        description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device tree blob\";
                        data = /incbin/(\"${DTB}\");
@@ -72,6 +74,7 @@ if [ -n "${DTB}" ]; then
                        };
                };
 "
+       FDT_PROP="fdt = \"fdt@1\";"
 fi
 
 # Create a default, fully populated DTS file
@@ -98,17 +101,15 @@ DATA="/dts-v1/;
                                algo = \"sha1\";
                        };
                };
-
-${FDT}
-
+${FDT_NODE}
        };
 
        configurations {
-               default = \"config@1\";
-               config@1 {
+               default = \"${CONFIG}\";
+               ${CONFIG} {
                        description = \"OpenWrt\";
                        kernel = \"kernel@1\";
-                       fdt = \"fdt@1\";
+                       ${FDT_PROP}
                };
        };
 };"