From: Stefano Stabellini <sstabellini@kernel.org>
Date: Thu, 16 Nov 2017 21:36:25 +0000 (-0800)
Subject: Split out dom0 and mkimage builds from the main build script
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=c690b01874bc8a424ba9a990a65ed8080908a2a0;p=people%2Fsstabellini%2Fmojo.git%2F.git

Split out dom0 and mkimage builds from the main build script

Signed-off-by: Stefano Stabellini <sstabellini@kernel.org>
---

diff --git a/alpine-dom0/build.sh b/alpine-dom0/build.sh
new file mode 100755
index 0000000..a279904
--- /dev/null
+++ b/alpine-dom0/build.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+BUILDER_LABEL="xen-builder"
+DOM0_LABEL="dom0"
+
+# Create build container
+exists=`docker images $BUILDER_LABEL | grep $BUILDER_LABEL`
+if test -z "$exists"
+then
+    docker build -f alpine-dom0/build.docker -t $BUILDER_LABEL .
+fi
+
+# Create Dom0
+exists=`docker images $DOM0_LABEL | grep $DOM0_LABEL`
+if test -z "$exists"
+then
+    docker build -f alpine-dom0/runtime.docker -t $DOM0_LABEL .
+fi
diff --git a/build.sh b/build.sh
index c015a0f..a4ab6de 100644
--- a/build.sh
+++ b/build.sh
@@ -1,39 +1,7 @@
 #!/bin/bash
 
-HOME_DIR=`pwd`
-OUT_DIR=$HOME_DIR/out
+# Build Dom0. Output is a container labeled "dom0".
+alpine-dom0/build.sh
 
-BUILDER_LABEL="xen-builder"
-DOM0_LABEL="dom0"
-IMAGE_BUILD_LABEL="image-builder"
-
-# Create build container
-exists=`docker images $BUILDER_LABEL | grep $BUILDER_LABEL`
-if test -z "$exists"
-then
-    docker build -f alpine-dom0/build.docker -t $BUILDER_LABEL .
-fi
-
-# Create Dom0
-exists=`docker images $DOM0_LABEL | grep $DOM0_LABEL`
-if test -z "$exists"
-then
-    docker build -f alpine-dom0/runtime.docker -t $DOM0_LABEL .
-fi
-
-# Create final image
-exists=`docker images $IMAGE_BUILD_LABEL | grep $IMAGE_BUILD_LABEL`
-if test -z "$exists"
-then
-    docker build -f mkimage/mkimage.docker -t $IMAGE_BUILD_LABEL .
-fi
-
-# Create system image
-if ! test -f out/image
-then
-    mkdir -p out &>/dev/null
-    docker run --privileged -i $IMAGE_BUILD_LABEL /make-efi > out/image
-fi
-
-
-# Clean-up
+# Create final image. Output is out/image.
+mkimage/build.sh
diff --git a/mkimage/build.sh b/mkimage/build.sh
new file mode 100755
index 0000000..846bcfc
--- /dev/null
+++ b/mkimage/build.sh
@@ -0,0 +1,19 @@
+HOME_DIR=`pwd`
+OUT_DIR=$HOME_DIR/out
+IMAGE_BUILD_LABEL="image-builder"
+
+# Create final image
+exists=`docker images $IMAGE_BUILD_LABEL | grep $IMAGE_BUILD_LABEL`
+if test -z "$exists"
+then
+    docker build -f mkimage/mkimage.docker -t $IMAGE_BUILD_LABEL .
+fi
+
+# Create system image
+if ! test -f $OUT_DIR/image
+then
+    mkdir -p $OUT_DIR &>/dev/null
+    docker run --privileged -i $IMAGE_BUILD_LABEL /make-efi > $OUT_DIR/image
+fi
+
+