summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2021-01-18 09:37:13 +0100
committerMax Krummenacher <max.krummenacher@toradex.com>2021-01-19 20:22:56 +0100
commitdd8c0e4a0ac40381e2ed0a112105e8d9a8af4387 (patch)
tree9ffeb4d747d94f44a9f76ddf3cd7f91218bb2dae
parent02a227afd8b099e79280131eddbe59d05f8e2865 (diff)
image_type_tezi: refine machine specific overlay deployment
The current wildcard setting deploys machine specific overlays with <machine>* and thus e.g. apalis-imx8 gets additionally those specific to apalis-imx8x. Fix that. Related to: ELB-3499 Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
-rw-r--r--classes/image_type_tezi.bbclass2
1 files changed, 1 insertions, 1 deletions
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