From: Stefano Stabellini <sstabellini@kernel.org>
Date: Mon, 20 Nov 2017 21:33:17 +0000 (-0800)
Subject: Parametrize mkimage build
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b5de31fabac722203b56f3e8f0715e5d5ed66fcf;p=people%2Fsstabellini%2Fmojo.git%2F.git

Parametrize mkimage build

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

diff --git a/mkimage/build.sh b/mkimage/build.sh
index f6745b2..5d1b1f0 100755
--- a/mkimage/build.sh
+++ b/mkimage/build.sh
@@ -1,21 +1,15 @@
 HOME_DIR=`pwd`
 OUT_DIR=$HOME_DIR/out
-GRUB_LABEL="grub-builder"
 IMAGE_BUILD_LABEL="image-builder"
 
-# Build Grub
-exists=`docker images $GRUB_LABEL | grep $GRUB_LABEL`
-if test -z "$exists"
-then
-    docker build -f mkimage/$GRUB_LABEL/build.docker -t $GRUB_LABEL .
-fi
-
-# Build image builder
-exists=`docker images $IMAGE_BUILD_LABEL | grep $IMAGE_BUILD_LABEL`
-if test -z "$exists"
-then
-    docker build -f mkimage/$IMAGE_BUILD_LABEL/build.docker -t $IMAGE_BUILD_LABEL .
-fi
+for label in `cat mkimage/series`
+do
+    exists=`docker images $label | grep $label`
+    if test -z "$exists"
+    then
+        docker build -f mkimage/$label/build.docker -t $label .
+    fi
+done
 
 # Create system image
 if ! test -f $OUT_DIR/image
@@ -25,4 +19,3 @@ then
     sync
 fi
 
-
diff --git a/mkimage/series b/mkimage/series
new file mode 100644
index 0000000..3647a25
--- /dev/null
+++ b/mkimage/series
@@ -0,0 +1,2 @@
+grub-builder
+image-builder