From 40ee8ead160d6cc292fee9ff654119b86cffd706 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Tue, 29 Jan 2013 17:17:59 -0600 Subject: [PATCH] finish script: do not leave *.dtbs hanging Signed-off-by: Robert Nelson --- scripts/debian-finish.sh | 5 ++++- scripts/ubuntu-finish.sh | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/debian-finish.sh b/scripts/debian-finish.sh index 9ff47dd..76ed2e9 100644 --- a/scripts/debian-finish.sh +++ b/scripts/debian-finish.sh @@ -121,7 +121,10 @@ cp /boot/vmlinuz-`uname -r` /boot/uboot/zImage cp /boot/initrd.img-`uname -r` /boot/uboot/initrd.img rm -f /boot/uboot/linux-image-*_1.0*_arm*.deb || true +#FIXME: Also reinstall these: +rm -f /boot/uboot/*dtbs.tar.gz || true + if [ "x${boot_image}" == "xbootm" ] ; then mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d /boot/initrd.img-`uname -r` /boot/uboot/uInitrd mkimage -A arm -O linux -T kernel -C none -a ${load_addr} -e ${load_addr} -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage -fi \ No newline at end of file +fi diff --git a/scripts/ubuntu-finish.sh b/scripts/ubuntu-finish.sh index a220951..1f29c3b 100644 --- a/scripts/ubuntu-finish.sh +++ b/scripts/ubuntu-finish.sh @@ -141,7 +141,10 @@ cp /boot/vmlinuz-`uname -r` /boot/uboot/zImage cp /boot/initrd.img-`uname -r` /boot/uboot/initrd.img rm -f /boot/uboot/linux-image-*_1.0*_arm*.deb || true +#FIXME: Also reinstall these: +rm -f /boot/uboot/*dtbs.tar.gz || true + if [ "x${boot_image}" == "xbootm" ] ; then mkimage -A arm -O linux -T ramdisk -C none -a 0 -e 0 -n initramfs -d /boot/initrd.img-`uname -r` /boot/uboot/uInitrd mkimage -A arm -O linux -T kernel -C none -a ${load_addr} -e ${load_addr} -n `uname -r` -d /boot/vmlinuz-`uname -r` /boot/uboot/uImage -fi \ No newline at end of file +fi