make apt-get work

1 files changed, 5 insertions, 1 deletions

diff --git a/makelavaimg b/makelavaimg
index bedfa7a..cce074f 100755
--- a/makelavaimg
+++ b/makelavaimg
@@ -10,7 +10,7 @@ set -e
 
 sudo dpkg --add-architecture i386
 sudo apt-get update
-sudo apt-get install --no-install-recommends -y kpartx u-boot-tools wget linaro-image-tools parted curl gdisk libc6:i386 libstdc++6:i386 zlib1g:i386 bc build-essential qemu-user-static linaro-image-tools python-pycurl python-beautifulsoup python-html2text python-xdg python-debian
+sudo apt-get install --no-install-recommends -y kpartx u-boot-tools wget linaro-image-tools parted curl gdisk libc6:i386 libstdc++6:i386 zlib1g:i386 bc build-essential qemu-user-static linaro-image-tools python-pycurl python-beautifulsoup python-html2text python-xdg python-debian qemu-user-static
 
 if [ -n "$1" -a -n "$2" ]; then 
  export hwpack="$1"
@@ -138,16 +138,20 @@ case $hwpack in
 esac
 
 #add hvc0 init file and xen tools package to the rootfs image
+set +e
 sudo cp ${FILES}/files/hvc0.conf ${MOUNT}/etc/init/
 sudo cp /etc/resolv.conf $MOUNT/etc/
+sudo cp /usr/bin/qemu-arm-static $MOUNT/usr/bin
 sudo chroot $MOUNT apt-get update
 sudo chroot $MOUNT apt-get install xen-system-armhf
 sudo cp $MOUNT/boot/xen-4.6-armhf $BOOTMOUNT/xen
+sudo rm $MOUNT/usr/bin/qemu-arm-static
 sudo umount $MOUNT
 sudo umount $BOOTMOUNT
 
 #tidy up mapper devices
 sudo kpartx -d ${image}
+set -e
 
 #compress the image
 gzip -9 ${image}