From cae8da64d383252ab1911accb28548d16326849c Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sun, 27 Aug 2017 12:06:22 +0200 Subject: classes/image_type_tezi.bbclass: fix for dtb filenames containing multiple dots In IMAGE_CMD_teziimg(), if a dtb file has more than one dot the current logic fails. e.g. device.tree.dtb will be truncated at the first dot to device. Fix by removing awk in favour of letting basename also remove the .dtb extension. Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- classes/image_type_tezi.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass index 87964ad..14ea7c4 100644 --- a/classes/image_type_tezi.bbclass +++ b/classes/image_type_tezi.bbclass @@ -189,7 +189,7 @@ IMAGE_CMD_teziimg () { # Create list of device tree files if test -n "${KERNEL_DEVICETREE}"; then for DTS_FILE in ${KERNEL_DEVICETREE}; do - DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'` + DTS_BASE_NAME=`basename ${DTS_FILE} .dtb` if [ -e "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb" ]; then KERNEL_DEVICETREE_FILES="${KERNEL_DEVICETREE_FILES} ${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb" else -- cgit v1.2.3