]> rtime.felk.cvut.cz Git - jailhouse-test.git/commitdiff
Change the bootstrap to our custom. For now, bootstrap-jh.bin contains whole image...
authorMaxim Baryshnikov <barysmax@fel.cvut.cz>
Sat, 23 Apr 2016 10:38:39 +0000 (12:38 +0200)
committerMaxim Baryshnikov <barysmax@fel.cvut.cz>
Sat, 23 Apr 2016 10:38:39 +0000 (12:38 +0200)
l4
qemu-launch-scripts/update-inmates-and-overlay.sh

diff --git a/l4 b/l4
index 8b802437467cab8f56ad122af7a2b96363996776..5ebb28e721042d0ceecd76e4cdccab4b9396dcc5 160000 (submodule)
--- a/l4
+++ b/l4
@@ -1 +1 @@
-Subproject commit 8b802437467cab8f56ad122af7a2b96363996776
+Subproject commit 5ebb28e721042d0ceecd76e4cdccab4b9396dcc5
index a01096e0ee9b506795ab7c5c0e3686a25fe1c037..625f954715d9dad31cea333a93aa4e2f0e0d7ff0 100755 (executable)
@@ -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