From ca1afed096f66116028ca8698aba70d648d7e128 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 18 Jan 2021 09:37:13 +0100 Subject: image_type_tezi: refine machine specific overlay deployment The current wildcard setting deploys machine specific overlays with * and thus e.g. apalis-imx8 gets additionally those specific to apalis-imx8x. Fix that. Related to: ELB-3499 Signed-off-by: Max Krummenacher (cherry picked from commit dd8c0e4a0ac40381e2ed0a112105e8d9a8af4387) --- classes/image_type_tezi.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'classes') diff --git a/classes/image_type_tezi.bbclass b/classes/image_type_tezi.bbclass index 059f547..454bdd2 100644 --- a/classes/image_type_tezi.bbclass +++ b/classes/image_type_tezi.bbclass @@ -354,7 +354,7 @@ tezi_deploy_dt_overlays() { deploy_dt_dir=${DEPLOY_DIR_IMAGE}/devicetree/ dtbos= if [ -z "${TEZI_EXTERNAL_KERNEL_DEVICETREE}" -a -d "$deploy_dt_dir" ] ; then - machine_dtbos=`cd $deploy_dt_dir && ls ${MACHINE_PREFIX}*.dtbo 2>/dev/null || true` + machine_dtbos=`cd $deploy_dt_dir && ls ${MACHINE_PREFIX}[_-]*.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 -- cgit v1.2.3