summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2020-10-14 18:29:26 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2020-10-17 18:43:43 +0200
commit0dc8e4b651a9d777b330630f979128fc483753ea (patch)
tree6e2fbf2fe05ce8abb651f9a5d2933c46ebbebc2c
parentefdf647e2c8f59ea284c179680b078d3ba241506 (diff)
image_type_tezi: fix machine overlay with carrier postfix deployment
We have machine overlay where the machine name is postfixed with the carrier board name, e.g. colibri-imx7-aster_atmel-mxt_overlay.dts. No longer require an '_' after the machine name to deploy also overlays with a postfix after the machine name. Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com> (cherry picked from commit 0e19023b9fd03f6922992c59f4ddc3a4aff9f36d)
-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 682295e..9dcbc9d 100644
--- a/classes/image_type_tezi.bbclass
+++ b/classes/image_type_tezi.bbclass
@@ -355,7 +355,7 @@ IMAGE_CMD_bootfs () {
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