summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Krummenacher <max.oss.09@gmail.com>2017-08-27 12:22:43 +0200
committerOtavio Salvador <otavio@ossystems.com.br>2017-08-30 10:17:43 -0300
commit42c201bd862db37a73721e99cdb27b80f937f3ee (patch)
tree15c356b37310c910e055fc6786e87db96e7f3e7c
parentcc13477949736d03fff05a52564516fe65b7eb19 (diff)
downloadmeta-freescale-42c201bd862db37a73721e99cdb27b80f937f3ee.tar.gz
image_types_fsl: fix for dtb filenames containing multiple dots
In _generate_boot_image(), 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' while it should be 'device.tree'. Fix by removing awk in favour of letting basename also remove the .dtb extension. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--classes/image_types_fsl.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/classes/image_types_fsl.bbclass b/classes/image_types_fsl.bbclass
index 91213e9ff..01db7041b 100644
--- a/classes/image_types_fsl.bbclass
+++ b/classes/image_types_fsl.bbclass
@@ -126,7 +126,7 @@ _generate_boot_image() {
126 # Copy device tree file 126 # Copy device tree file
127 if test -n "${KERNEL_DEVICETREE}"; then 127 if test -n "${KERNEL_DEVICETREE}"; then
128 for DTS_FILE in ${KERNEL_DEVICETREE}; do 128 for DTS_FILE in ${KERNEL_DEVICETREE}; do
129 DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'` 129 DTS_BASE_NAME=`basename ${DTS_FILE} .dtb`
130 if [ -e "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb" ]; then 130 if [ -e "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb" ]; then
131 kernel_bin="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin`" 131 kernel_bin="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin`"
132 kernel_bin_for_dtb="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb | sed "s,$DTS_BASE_NAME,${MACHINE},g;s,\.dtb$,.bin,g"`" 132 kernel_bin_for_dtb="`readlink ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTS_BASE_NAME}.dtb | sed "s,$DTS_BASE_NAME,${MACHINE},g;s,\.dtb$,.bin,g"`"