From 75e972444b3b06b17c43af1336c8eb217bf6d017 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 24 Jul 2014 09:12:54 -0500
Subject: [PATCH] dtb: grab these from the kernel package

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
 mk_mmc.sh | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/mk_mmc.sh b/mk_mmc.sh
index 457f517..e58b886 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -1223,10 +1223,17 @@ populate_boot () {
 
 	if [ "${ACTUAL_DTB_FILE}" ] ; then
 		echo "Copying Device Tree Files:"
-		if [ "x${conf_boot_fstype}" = "xfat" ] ; then
-			tar xfvo "${DIR}/dl/${DISTARCH}/${ACTUAL_DTB_FILE}" -C ${TEMPDIR}/disk/dtbs
+		if [ -d "${TEMPDIR}/kernel/boot/dtbs/${uname_r}/" ] ; then
+			echo "Debug: grabbing *.dtb from linux-image*.deb"
+			mkdir -p ${TEMPDIR}/disk/dtbs
+			cp -v ${TEMPDIR}/kernel/boot/dtbs/${uname_r}/*.dtb ${TEMPDIR}/disk/dtbs
 		else
-			tar xfv "${DIR}/dl/${DISTARCH}/${ACTUAL_DTB_FILE}" -C ${TEMPDIR}/disk/dtbs
+			echo "Debug: did not find *.dtb in linux-image*.deb"
+			if [ "x${conf_boot_fstype}" = "xfat" ] ; then
+				tar xfvo "${DIR}/dl/${DISTARCH}/${ACTUAL_DTB_FILE}" -C ${TEMPDIR}/disk/dtbs
+			else
+				tar xfv "${DIR}/dl/${DISTARCH}/${ACTUAL_DTB_FILE}" -C ${TEMPDIR}/disk/dtbs
+			fi
 		fi
 		cp -v "${DIR}/dl/${DISTARCH}/${ACTUAL_DTB_FILE}" ${TEMPDIR}/disk/
 		echo "-----------------------------"