From 02277c17574884ea0ae1568d9b7c62f4e3d37c72 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 21 Aug 2014 15:33:10 -0500
Subject: [PATCH] mk_mmc.sh: support deb not in repo

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

diff --git a/mk_mmc.sh b/mk_mmc.sh
index 0a3e6eb..54676c7 100755
--- a/mk_mmc.sh
+++ b/mk_mmc.sh
@@ -700,15 +700,16 @@ initrd_preseed_settings () {
 	cp -v "${DIR}/lib/shared/zz-uenv_txt" ${TEMPDIR}/initrd-tree/zz-uenv_txt
 	cp -v "${DIR}/lib/${DIST}-preseed.cfg" ${TEMPDIR}/initrd-tree/preseed.cfg
 
-	#repos.rcn-ee.net: add linux-image-${uname -r}
-	sed -i -e 's:ntpdate:ntpdate linux-image-'$uname_r':g' ${TEMPDIR}/initrd-tree/preseed.cfg
+	if [ ! "x${deb_not_in_repo}" = "xenable" ] ; then
+		#repos.rcn-ee.net: add linux-image-${uname -r}
+		sed -i -e 's:ntpdate:ntpdate linux-image-'$uname_r':g' ${TEMPDIR}/initrd-tree/preseed.cfg
+		cat ${TEMPDIR}/initrd-tree/preseed.cfg | grep linux-image
+	fi
 
 	if [ ! "x${conf_smart_uboot}" = "xenable" ] ; then
 		sed -i -e 's:ntpdate:ntpdate u-boot-tools:g' ${TEMPDIR}/initrd-tree/preseed.cfg
 	fi
 
-	cat ${TEMPDIR}/initrd-tree/preseed.cfg | grep linux-image
-
 	case "${DIST}" in
 	wheezy)
 		if [ ! "x${di_serial_mode}" = "xenable" ] && [ "${conf_kernel_usb_not_builtin}" ] ; then
@@ -987,7 +988,11 @@ populate_boot () {
 	fi
 
 	echo "Copying Device Tree Files:"
-	cp ${TEMPDIR}/kernel/boot/dtbs/${uname_r}/*.dtb ${TEMPDIR}/disk/boot/dtbs/current/
+	if [ ! "x${deb_not_in_repo}" = "xenable" ] ; then
+		cp ${TEMPDIR}/kernel/boot/dtbs/${uname_r}/*.dtb ${TEMPDIR}/disk/boot/dtbs/current/
+	else
+		cp ${TEMPDIR}/kernel/boot/dtbs/${LINUX_VER}/*.dtb ${TEMPDIR}/disk/boot/dtbs/current/
+	fi
 
 	if [ "${conf_uboot_bootscript}" ] ; then
 		case "${dtb}" in
@@ -1409,6 +1414,7 @@ while [ ! -z "$1" ] ; do
 		external_deb_file="$2"
 		DEB_FILE="${external_deb_file}"
 		KERNEL_DEB=1
+		deb_not_in_repo="enable"
 		;;
 	--use-beta-kernel)
 		BETA_KERNEL=1