mk_mmc.sh: cleanup: only install u-boot-tools if needed

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>

lib/jessie-preseed.cfg

@@ -58,7 +58,7 @@ d-i partman-auto/disk string /dev/mmcblk0
 d-i partman-auto/expert_recipe_file string /partition_recipe
 
 # Individual additional packages to install
-d-i pkgsel/include string bash initramfs-tools ntpdate util-linux u-boot-tools wget
+d-i pkgsel/include string bash initramfs-tools ntpdate util-linux wget
 
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade

lib/trusty-preseed.cfg

@@ -62,7 +62,7 @@ d-i partman-auto/disk string /dev/mmcblk0
 d-i partman-auto/expert_recipe_file string /partition_recipe
 
 # Individual additional packages to install
-d-i pkgsel/include string bash initramfs-tools ntpdate util-linux u-boot-tools wget
+d-i pkgsel/include string bash initramfs-tools ntpdate util-linux wget
 
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade

lib/utopic-preseed.cfg

@@ -62,7 +62,7 @@ d-i partman-auto/disk string /dev/mmcblk0
 d-i partman-auto/expert_recipe_file string /partition_recipe
 
 # Individual additional packages to install
-d-i pkgsel/include string bash initramfs-tools ntpdate util-linux u-boot-tools wget
+d-i pkgsel/include string bash initramfs-tools ntpdate util-linux wget
 
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade

lib/wheezy-preseed.cfg

@@ -55,7 +55,7 @@ d-i partman-auto/disk string /dev/mmcblk0
 d-i partman-auto/expert_recipe_file string /partition_recipe
 
 # Individual additional packages to install
-d-i pkgsel/include string bash initramfs-tools ntpdate util-linux u-boot-tools wget
+d-i pkgsel/include string bash initramfs-tools ntpdate util-linux wget
 
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade

mk_mmc.sh

@@ -704,7 +704,12 @@ initrd_preseed_settings () {
 	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:initramfs-tools:initramfs-tools linux-image-'$uname_r':g' ${TEMPDIR}/initrd-tree/preseed.cfg
+	sed -i -e 's:ntpdate:ntpdate linux-image-'$uname_r':g' ${TEMPDIR}/initrd-tree/preseed.cfg
+
+	if [ ! "x${conf_bootloader_in_flash}" = "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