From acad3d7b580889a630d5b9351fd784786d2f1eb8 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Tue, 29 Jul 2014 10:00:38 -0500 Subject: [PATCH] mk_mmc.sh: cleanup: only install u-boot-tools if needed Signed-off-by: Robert Nelson --- lib/jessie-preseed.cfg | 2 +- lib/trusty-preseed.cfg | 2 +- lib/utopic-preseed.cfg | 2 +- lib/wheezy-preseed.cfg | 2 +- mk_mmc.sh | 7 ++++++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/jessie-preseed.cfg b/lib/jessie-preseed.cfg index 351d0bd..3a15a9d 100644 --- a/lib/jessie-preseed.cfg +++ b/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 diff --git a/lib/trusty-preseed.cfg b/lib/trusty-preseed.cfg index b40b35f..aa86691 100644 --- a/lib/trusty-preseed.cfg +++ b/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 diff --git a/lib/utopic-preseed.cfg b/lib/utopic-preseed.cfg index 8d7ad30..294bdbd 100644 --- a/lib/utopic-preseed.cfg +++ b/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 diff --git a/lib/wheezy-preseed.cfg b/lib/wheezy-preseed.cfg index 75ee4ae..ed4d646 100644 --- a/lib/wheezy-preseed.cfg +++ b/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 diff --git a/mk_mmc.sh b/mk_mmc.sh index efc40ee..e60928e 100755 --- a/mk_mmc.sh +++ b/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