hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: make device-tree arg optional in mkits.sh 

mkits.sh help currently shows dtb file as optional, but generates an
invalid its file when this option is unspecified.

We're fixing this problem by removing the use of the sed command and
just including variables instead.

Signed-off-by: Mathieu Olivari <mathieu@qca.qualcomm.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45659 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Felix Fietkau 2015-05-10 11:46:45 +00:00
parent 3a8303ca9e
commit 4022f5a9f4
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
scripts/mkits.sh
View File

@ -55,6 +55,25 @@ fi
ARCH_UPPER=`echo $ARCH | tr '[:lower:]' '[:upper:]'`
# Conditionally create fdt information
if [ -n "${DTB}" ]; then
FDT="
fdt@1 {
description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device tree blob\";
data = /incbin/(\"${DTB}\");
type = \"flat_dt\";
arch = \"${ARCH}\";
compression = \"none\";
hash@1 {
algo = \"crc32\";
};
hash@2 {
algo = \"sha1\";
};
};
"
fi
# Create a default, fully populated DTS file
DATA="/dts-v1/;
@ -80,19 +99,8 @@ DATA="/dts-v1/;
};
};
fdt@1 {
description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device tree blob\";
data = /incbin/(\"${DTB}\");
type = \"flat_dt\";
arch = \"${ARCH}\";
compression = \"none\";
hash@1 {
algo = \"crc32\";
};
hash@2 {
algo = \"sha1\";
};
};
${FDT}
};
configurations {
@ -105,11 +113,5 @@ DATA="/dts-v1/;
};
};"
# Conditionally strip fdt information out of tree
if [ -z "${DTB}" ]; then
DATA=`echo "$DATA" | sed '/start fdt/,/end fdt/d'`
DATA=`echo "$DATA" | sed '/fdt/d'`
fi
# Write .its file to disk
echo "$DATA" > ${OUTPUT}