From c26694bce88c9bee8b746ed458130059e4bc0d63 Mon Sep 17 00:00:00 2001 From: Oleksandr Suvorov Date: Mon, 8 Jun 2020 11:22:44 +0300 Subject: image_type_tezi.bbclass: fix getting list if dtbos Commit 0b33be8f "image_type_tezi.bbclass: allow inexistence of machine specific overlays" introduces the regression bug, that prevents to gather machine-specific dtbos. This commit fixes the bug. Fixed: 0b33be8f ("image_type_tezi.bbclass: allow inexistence of machine specific overlays") Signed-off-by: Oleksandr Suvorov (cherry picked from commit 5846cdddd88363cfa8bab0bf14d5999f20503709) --- classes/image_type_tezi.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'classes/image_type_tezi.bbclass') diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass index ef888a6..054674f 100644 --- a/classes/image_type_tezi.bbclass +++ b/classes/image_type_tezi.bbclass @@ -348,9 +348,9 @@ TAR_IMAGE_ROOTFS_task-image-bootfs = "${WORKDIR}/bootfs" IMAGE_CMD_bootfs () { deploy_dt_dir=${DEPLOY_DIR_IMAGE}/devicetree/ dtbos= - if [ -z "${TEZI_EXTERNAL_KERNEL_DEVICETREE}"] ; then - machine_dtbos=`cd $deploy_dt_dir || ls ${MACHINE}_*.dtbo` - common_dtbos=`cd $deploy_dt_dir && ls *.dtbo | grep -v -e 'imx[6-8]' -e 'tk1' | xargs` + if [ -z "${TEZI_EXTERNAL_KERNEL_DEVICETREE}" -a -d "$deploy_dt_dir" ] ; then + machine_dtbos=`cd $deploy_dt_dir && ls ${MACHINE}_*.dtbo 2>/dev/null || true` + common_dtbos=`cd $deploy_dt_dir && ls *.dtbo 2>/dev/null | grep -v -e 'imx[6-8]' -e 'tk1' | xargs || true` dtbos="$machine_dtbos $common_dtbos" else dtbos=${TEZI_EXTERNAL_KERNEL_DEVICETREE} -- cgit v1.2.3