EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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>

SVN-Revision: 45659
This commit is contained in:
Felix Fietkau 2015-05-10 11:46:45 +00:00
parent 9913b6a90a
commit a37814faa7
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:]'` 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 # Create a default, fully populated DTS file
DATA="/dts-v1/; DATA="/dts-v1/;
@ -80,19 +99,8 @@ DATA="/dts-v1/;
}; };
}; };
fdt@1 { ${FDT}
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\";
};
};
}; };
configurations { 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 # Write .its file to disk
echo "$DATA" > ${OUTPUT} echo "$DATA" > ${OUTPUT}