From: Matt Ranostay <matt.ranostay@konsulko.com>
Date: Fri, 27 Jan 2017 02:35:39 +0000 (+0000)
Subject: meta-raspberrypi: fix overlay issues with sdcard_image-rpi-gdp.bbclass
X-Git-Tag: 3.99.1~177
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=942c143a34b1e37d04e7946df59cfad5e6e1c8e0;p=AGL%2Fmeta-agl.git

meta-raspberrypi: fix overlay issues with sdcard_image-rpi-gdp.bbclass

Use smarter detection of overlays blobs for copying into sdcard image.

Issue: SPEC-409
Change-Id: Ic0d039ad5bfb18896fb1b52474ce2348a5434a0f
Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
---

diff --git a/meta-agl-bsp/classes/sdcard_image-rpi-gdp.bbclass b/meta-agl-bsp/classes/sdcard_image-rpi-gdp.bbclass
index b26323950..725ada89d 100644
--- a/meta-agl-bsp/classes/sdcard_image-rpi-gdp.bbclass
+++ b/meta-agl-bsp/classes/sdcard_image-rpi-gdp.bbclass
@@ -66,9 +66,10 @@ IMAGE_CMD_rpi-sdimg () {
 			# Copy device tree overlays to dedicated folder
 			mmd -i ${WORKDIR}/boot.img overlays
 			for DTB in ${DT_OVERLAYS}; do
-				DTB_BASE_NAME=`basename ${DTB} .dtb`
+				DTB_EXT=${DTB##*.}
+				DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
 
-				mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::overlays/${DTB_BASE_NAME}.dtbo
+				mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.${DTB_EXT} ::overlays/${DTB_BASE_NAME}.${DTB_EXT}
 			done
 		fi
 		mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${KERNEL_INITRAMFS}-${MACHINE}.bin ::${SDIMG_KERNELIMAGE}