From: Maxim Baryshnikov <barysmax@fel.cvut.cz>
Date: Sat, 23 Apr 2016 10:38:39 +0000 (+0200)
Subject: Change the bootstrap to our custom. For now, bootstrap-jh.bin contains whole image... 
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/jailhouse-test.git/commitdiff_plain/412c9ec753af498581b84c8bd13bc63603ba2fec?ds=sidebyside

Change the bootstrap to our custom. For now, bootstrap-jh.bin contains whole image bootstrap_hello.
---

diff --git a/l4 b/l4
index 8b80243..5ebb28e 160000
--- a/l4
+++ b/l4
@@ -1 +1 @@
-Subproject commit 8b802437467cab8f56ad122af7a2b96363996776
+Subproject commit 5ebb28e721042d0ceecd76e4cdccab4b9396dcc5
diff --git a/qemu-launch-scripts/update-inmates-and-overlay.sh b/qemu-launch-scripts/update-inmates-and-overlay.sh
index a01096e..625f954 100755
--- a/qemu-launch-scripts/update-inmates-and-overlay.sh
+++ b/qemu-launch-scripts/update-inmates-and-overlay.sh
@@ -10,9 +10,10 @@ 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/l4re/pkg/bootstrap_custom
-make clean && make
-objcopy -O binary ./server/src/OBJ-x86_pentium/bootstrap.elf $START_DIR/../buildroot-overlay/jailhouse/bootstrap-jh.bin
+cd ../build/l4
+make hello
+cd l4re/pkg/bootstrap_custom
+objcopy -O binary ./server/src/OBJ-x86_pentium/bootstrap_hello.elf $START_DIR/../buildroot-overlay/jailhouse/bootstrap-jh.bin
 echo "Update rootfs..."
 cd $START_DIR/../build/buildroot/
 make