l4: Improve benchmark.

[jailhouse-test.git] / qemu-launch-scripts / update-inmates-and-overlay.sh

diff --git a/qemu-launch-scripts/update-inmates-and-overlay.sh b/qemu-launch-scripts/update-inmates-and-overlay.sh
index d0b573b5484ca59ad23bf0c8171d330460c614f4..8c87b72088b84201edb189cc5a77b216760c1460 100755 (executable)
--- a/qemu-launch-scripts/update-inmates-and-overlay.sh
+++ b/qemu-launch-scripts/update-inmates-and-overlay.sh
@@ -1,14 +1,35 @@
 #!/bin/bash
 
-set -e
+set -e;
+set -x;
 
+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
+export KDIR=$PWD/../build/buildroot/build/linux-custom
+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
+make bench
+cd l4re/pkg/bootstrap_custom
+objcopy -O binary ./server/src/OBJ-$ARCH_IMAGE/bootstrap.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
+objcopy -O binary ./server/src/OBJ-$ARCH_IMAGE/bootstrap_bench.elf $START_DIR/../buildroot-overlay/jailhouse/bootstrap_bench-jh.bin
+
 echo "Update rootfs..."
-cd ../build/buildroot/
+cd $START_DIR/../build/buildroot/
 make
+
 echo "done!"