Clean up temporary files and directories left by build_image, etc.

src/scripts/build_gpt.sh

Index: src/scripts/build_gpt.sh
diff --git a/src/scripts/build_gpt.sh b/src/scripts/build_gpt.sh
index f9179b2b8d3f6624b062e304ebbe6ce8097e5cc1..d9346202f014290c236f2115f389da71be4dc620 100755
--- a/src/scripts/build_gpt.sh
+++ b/src/scripts/build_gpt.sh
@@ -130,6 +130,7 @@ if [[ "$ARCH" = "arm" ]]; then
     hexdump -v -C "$MBR_IMG"
   else
     echo "Error: u-boot mkimage not found or not executable."
+    exit 1
   fi
   PMBRCODE=${MBR_IMG}
 else
@@ -140,6 +141,9 @@ fi
 # describing the partition table entries (see the comments in the source).
 install_gpt $OUTDEV $ROOTFS_IMG $KERNEL_IMG $STATEFUL_IMG $PMBRCODE
 
+# Emit helpful scripts for testers, etc.
+${SCRIPTS_DIR}/emit_gpt_scripts.sh "${OUTDEV}" "${IMAGEDIR}"
+
 # Now populate the partitions.
 echo "Copying stateful partition..."
 dd if=${STATEFUL_IMG} of=${OUTDEV} conv=notrunc bs=512 seek=${START_STATEFUL}
@@ -150,3 +154,7 @@ dd if=${KERNEL_IMG} of=${OUTDEV} conv=notrunc bs=512 seek=${START_KERN_A}
 echo "Copying rootfs..."
 dd if=${ROOTFS_IMG} of=${OUTDEV} conv=notrunc bs=512 seek=${START_ROOTFS_A}
 
+# Clean up temporary files.
+if [[ -n "${MBR_IMG:-}" ]]; then
+  rm "${MBR_IMG}"
+fi