From: Michal Sojka <sojkam1@fel.cvut.cz>
Date: Tue, 23 Feb 2016 09:02:45 +0000 (+0100)
Subject: Simplify build script
X-Git-Url: https://rtime.felk.cvut.cz/gitweb/jailhouse-test.git/commitdiff_plain/34bc74e7b31fc88615eee61b009ec88c7f54ab76

Simplify build script
---

diff --git a/jailhouse-install.sh b/jailhouse-install.sh
index 18880f1..8ef8c6f 100755
--- a/jailhouse-install.sh
+++ b/jailhouse-install.sh
@@ -1,20 +1,16 @@
 #!/bin/bash
-echo "moving to buildroot folder.."
-cd ./build/buildroot
-make
-echo "done buildroot"
-cd ../../
-echo "moving to jailhouse dir..."
-cd ./jailhouse
-PARENTDIR=$(dirname $PWD)
-KDIR=$PARENTDIR/build/buildroot/build/linux-custom
-DESTDIR=$PARENTDIR/buildroot-overlay 
-export KDIR
-export DESTDIR
-echo "KDIR=$KDIR"
-echo "DESTDIR=$DESTDIR"
-make && make install
-mkdir ../buildroot-overlay/jailhouse
-mkdir ../buildroot-overlay/jailhouse/inmates
-mkdir ../buildroot-overlay/jailhouse/configs
+
+set -x
+set -e
+
+cd $(dirname $0)
+
+make -C ./build/buildroot
+
+make -C jailhouse all install KDIR=$PWD/build/buildroot/build/linux-custom DESTDIR=$PWD/buildroot-overlay 
+
+mkdir -p buildroot-overlay/jailhouse
+mkdir -p buildroot-overlay/jailhouse/inmates
+mkdir -p buildroot-overlay/jailhouse/configs
+
 echo "done!"