From 11fafb195c0e3307dee1843b4c351123cedd1abd Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 30 Aug 2013 10:57:19 -0500
Subject: [PATCH] chroot: only call mkimage if u-boot-tools is installed
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
scripts/chroot.sh | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index c869d8147..943feb357 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -477,7 +477,16 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
depmod \${kernel_version}
update-initramfs -c -k \${kernel_version}
- mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d /boot/initrd.img-\${kernel_version} /boot/uInitrd-\${kernel_version}
+
+ pkg="u-boot-tools"
+ dpkg_check
+
+ if [ "x\${pkg_is_not_installed}" = "x" ] ; then
+ mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d /boot/initrd.img-\${kernel_version} /boot/uInitrd-\${kernel_version}
+ else
+ dpkg_package_missing
+ fi
+
rm -f /tmp/index.html || true
rm -f /tmp/temp.html || true
rm -f /tmp/\${deb_file} || true
@@ -597,7 +606,7 @@ cat > ${DIR}/chroot_script.sh <<-__EOF__
install_pkg_updates
install_pkgs
if [ "${chroot_KERNEL_HTTP_DIR}" ] ; then
- packages="initramfs-tools u-boot-tools"
+ packages="initramfs-tools"
for pkg in \${packages} ; do check_n_install ; done
fi
set_locale
--
GitLab