From: Maxim Baryshnikov <barysmax@fel.cvut.cz>
Date: Sat, 30 Apr 2016 15:52:14 +0000 (+0200)
Subject: qemu: Change update-script to follow the ferret pkg changes also,
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/jailhouse-test.git/commitdiff_plain/ce903b7b9912d2d6f2d1af0647064ec17dd3b7fb

qemu: Change update-script to follow the ferret pkg changes also,
	i.e. remake and copy images to overlay.
---

diff --git a/qemu-launch-scripts/update-inmates-and-overlay.sh b/qemu-launch-scripts/update-inmates-and-overlay.sh
index 625f954..025208c 100755
--- a/qemu-launch-scripts/update-inmates-and-overlay.sh
+++ b/qemu-launch-scripts/update-inmates-and-overlay.sh
@@ -2,19 +2,30 @@
 
 set -e
 
+if [ -z $ARCH_IMAGE]; then
+	ARCH_IMAGE="x86_pentium"
+fi
+
 START_DIR=$(pwd)
 echo "going inside Jailhouse dir for to remake it..."
 cd ../jailhouse
 make clean && make modules
+
 echo "Copying inmates to overlay dir..."
 cp ./inmates/demos/x86/*.bin ../buildroot-overlay/jailhouse/inmates/
 cp ./configs/*.cell ../buildroot-overlay/jailhouse/configs/
+
 echo "remake bootstrap and objcopy it to overlay.."
 cd ../build/l4
 make hello
+make benchmarks
+
 cd l4re/pkg/bootstrap_custom
-objcopy -O binary ./server/src/OBJ-x86_pentium/bootstrap_hello.elf $START_DIR/../buildroot-overlay/jailhouse/bootstrap-jh.bin
+objcopy -O binary ./server/src/OBJ-$ARCH_IMAGE/bootstrap_hello.elf $START_DIR/../buildroot-overlay/jailhouse/bootstrap_hello-jh.bin
+objcopy -O binary ./server/src/OBJ-$ARCH_IMAGE/bootstrap_ferret-bench.elf $START_DIR/../buildroot-overlay/jailhouse/bootstrap_ferret-bench-jh.bin
+
 echo "Update rootfs..."
 cd $START_DIR/../build/buildroot/
 make
+
 echo "done!"