Fix some mistakes in build script.

diff --git a/qemu-launch-scripts/update-inmates-and-overlay.sh b/qemu-launch-scripts/update-inmates-and-overlay.sh
index 18a2ce1cd9565086804b75fe5e7d8e290b5e1446..6f5a65b330247a6fabb0601c82bc0d955b8fab1a 100755 (executable)
--- a/qemu-launch-scripts/update-inmates-and-overlay.sh
+++ b/qemu-launch-scripts/update-inmates-and-overlay.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+set -e;
+set -x;
 
 if [ -z $ARCH_IMAGE]; then
        ARCH_IMAGE="x86_pentium"
@@ -9,7 +10,8 @@ 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/
@@ -21,6 +23,7 @@ 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