*tcwg*: Replace tcwg-base/*/build.sh files with tcwg-base/*/build-image.sh

Current tcwg-base/*/build.sh files could be used only by hand and,
therefore, are pretty useless.  Get rid of them.

Change-Id: Ibd35529f733729345c504704684c7e696a03ff92

44 files changed, 98 insertions, 126 deletions

diff --git a/tcwg-base/build-image.sh b/tcwg-base/build-image.sh
deleted file mode 100755
index 14751841..00000000
--- a/tcwg-base/build-image.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-  rm -rf tcwg-buildslave
-}
-
-export LANG=C
-top=$(git rev-parse --show-toplevel)
-distro=$(basename ${PWD} | cut -f1 -d '-')
-arch=$(basename ${PWD} | cut -f2 -d '-')
-name=$(basename ${PWD} | cut -f3- -d '-')
-image=linaro/ci-${arch}-${name}-ubuntu:${distro}
-baseimage=$(grep "^FROM" Dockerfile | head -n 1 | cut -d" " -f 2)
-
-"$top"/tcwg-base/validate-dockerfile.sh Dockerfile
-docker pull $baseimage 2>/dev/null || true
-docker pull $image 2>/dev/null || true
-docker build --tag=$image .
-echo $image > .docker-tag
diff --git a/tcwg-base/build.sh b/tcwg-base/build.sh
index 8ed9a7ef..14751841 100755
--- a/tcwg-base/build.sh
+++ b/tcwg-base/build.sh
@@ -2,9 +2,23 @@
 
 set -e
 
-#
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+  rm -rf tcwg-buildslave
+}
+
+export LANG=C
 top=$(git rev-parse --show-toplevel)
+distro=$(basename ${PWD} | cut -f1 -d '-')
+arch=$(basename ${PWD} | cut -f2 -d '-')
+name=$(basename ${PWD} | cut -f3- -d '-')
+image=linaro/ci-${arch}-${name}-ubuntu:${distro}
+baseimage=$(grep "^FROM" Dockerfile | head -n 1 | cut -d" " -f 2)
 
-for i in $top/*-tcwg-base/; do
-    (cd $i; ./build.sh)
-done
+"$top"/tcwg-base/validate-dockerfile.sh Dockerfile
+docker pull $baseimage 2>/dev/null || true
+docker pull $image 2>/dev/null || true
+docker build --tag=$image .
+echo $image > .docker-tag
diff --git a/tcwg-base/tcwg-build/build-image.sh b/tcwg-base/tcwg-build/build-image.sh
deleted file mode 100755
index 8624b7fd..00000000
--- a/tcwg-base/tcwg-build/build-image.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-
-set -e
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-  rm -rf tcwg-buildslave tcwg-benchmark
-}
-
-export LANG=C
-distro=$(basename ${PWD} | cut -f1 -d '-')
-arch=$(basename ${PWD} | cut -f2 -d '-')
-name=$(basename ${PWD} | cut -f3- -d '-')
-image=linaro/ci-${arch}-${name}-ubuntu:${distro}
-top=$(git rev-parse --show-toplevel)
-
-rsync -a $top/tcwg-base/tcwg-build/tcwg-buildslave/ ./tcwg-buildslave/
-rsync -a $top/tcwg-base/tcwg-build/tcwg-benchmark/ ./tcwg-benchmark/
-
-(cd ..; ./build.sh)
-"$top"/tcwg-base/validate-dockerfile.sh Dockerfile
-docker pull $image 2>/dev/null || true
-docker build --tag=$image .
-echo $image > .docker-tag
diff --git a/tcwg-base/tcwg-build/build.sh b/tcwg-base/tcwg-build/build.sh
index 458d6561..8624b7fd 100755
--- a/tcwg-base/tcwg-build/build.sh
+++ b/tcwg-base/tcwg-build/build.sh
@@ -2,8 +2,25 @@
 
 set -e
 
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+  rm -rf tcwg-buildslave tcwg-benchmark
+}
+
+export LANG=C
+distro=$(basename ${PWD} | cut -f1 -d '-')
+arch=$(basename ${PWD} | cut -f2 -d '-')
+name=$(basename ${PWD} | cut -f3- -d '-')
+image=linaro/ci-${arch}-${name}-ubuntu:${distro}
 top=$(git rev-parse --show-toplevel)
 
-for i in $top/*-tcwg-base/*-tcwg-build/; do
-    (cd $i; ./build.sh)
-done
+rsync -a $top/tcwg-base/tcwg-build/tcwg-buildslave/ ./tcwg-buildslave/
+rsync -a $top/tcwg-base/tcwg-build/tcwg-benchmark/ ./tcwg-benchmark/
+
+(cd ..; ./build.sh)
+"$top"/tcwg-base/validate-dockerfile.sh Dockerfile
+docker pull $image 2>/dev/null || true
+docker build --tag=$image .
+echo $image > .docker-tag
diff --git a/tcwg-base/tcwg-dev/build-image.sh b/tcwg-base/tcwg-dev/build-image.sh
deleted file mode 100755
index 8729547c..00000000
--- a/tcwg-base/tcwg-dev/build-image.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-set -e
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-    rm -f start.sh run.sh
-}
-
-export LANG=C
-distro=$(basename ${PWD} | cut -f1 -d '-')
-arch=$(basename ${PWD} | cut -f2 -d '-')
-name=$(basename ${PWD} | cut -f3- -d '-')
-image=linaro/ci-${arch}-${name}-ubuntu:${distro}
-top=$(git rev-parse --show-toplevel)
-
-cat $top/tcwg-base/tcwg-dev/start.sh.tmpl \
-    | sed -e "s#@IMAGE@#$image#g" \
-	  -e "s#@DISTRO@#$distro#g" > start.sh
-chmod +x start.sh
-cp $top/tcwg-base/tcwg-dev/run.sh.tmpl run.sh
-
-(cd ..; ./build.sh)
-"$top"/tcwg-base/validate-dockerfile.sh Dockerfile
-docker pull $image 2>/dev/null || true
-docker build --tag=$image .
-echo $image > .docker-tag
diff --git a/tcwg-base/tcwg-dev/build.sh b/tcwg-base/tcwg-dev/build.sh
index 74040bed..8729547c 100755
--- a/tcwg-base/tcwg-dev/build.sh
+++ b/tcwg-base/tcwg-dev/build.sh
@@ -2,8 +2,28 @@
 
 set -e
 
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+    rm -f start.sh run.sh
+}
+
+export LANG=C
+distro=$(basename ${PWD} | cut -f1 -d '-')
+arch=$(basename ${PWD} | cut -f2 -d '-')
+name=$(basename ${PWD} | cut -f3- -d '-')
+image=linaro/ci-${arch}-${name}-ubuntu:${distro}
 top=$(git rev-parse --show-toplevel)
 
-for i in $top/*-tcwg-base/*-tcwg-dev/; do
-    (cd $i; ./build.sh)
-done
+cat $top/tcwg-base/tcwg-dev/start.sh.tmpl \
+    | sed -e "s#@IMAGE@#$image#g" \
+	  -e "s#@DISTRO@#$distro#g" > start.sh
+chmod +x start.sh
+cp $top/tcwg-base/tcwg-dev/run.sh.tmpl run.sh
+
+(cd ..; ./build.sh)
+"$top"/tcwg-base/validate-dockerfile.sh Dockerfile
+docker pull $image 2>/dev/null || true
+docker build --tag=$image .
+echo $image > .docker-tag
diff --git a/tcwg-base/tcwg-llvmbot/build-image.sh b/tcwg-base/tcwg-llvmbot/build.sh
index 34860c0f..34860c0f 100755
--- a/tcwg-base/tcwg-llvmbot/build-image.sh
+++ b/tcwg-base/tcwg-llvmbot/build.sh
diff --git a/trusty-amd64-tcwg-base/build.sh b/trusty-amd64-tcwg-base/build.sh
index d12245ba..67d8934e 120000
--- a/trusty-amd64-tcwg-base/build.sh
+++ b/trusty-amd64-tcwg-base/build.sh
@@ -1 +1 @@
-../tcwg-base/build-image.sh
\ No newline at end of file
+../tcwg-base/build.sh
\ No newline at end of file
diff --git a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/build.sh b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/build.sh
index fa671768..50162e02 120000
--- a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/build.sh
+++ b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-build/build.sh
@@ -1 +1 @@
-../../tcwg-base/tcwg-build/build-image.sh
\ No newline at end of file
+../../tcwg-base/tcwg-build/build.sh
\ No newline at end of file
diff --git a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-dev/build.sh b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-dev/build.sh
index 663ce893..e8571a37 120000
--- a/trusty-amd64-tcwg-base/trusty-amd64-tcwg-dev/build.sh
+++ b/trusty-amd64-tcwg-base/trusty-amd64-tcwg-dev/build.sh
@@ -1 +1 @@
-../../tcwg-base/tcwg-dev/build-image.sh
\ No newline at end of file
+../../tcwg-base/tcwg-dev/build.sh
\ No newline at end of file
diff --git a/trusty-arm64-tcwg-base/build.sh b/trusty-arm64-tcwg-base/build.sh
index d12245ba..67d8934e 120000
--- a/trusty-arm64-tcwg-base/build.sh
+++ b/trusty-arm64-tcwg-base/build.sh
@@ -1 +1 @@
-../tcwg-base/build-image.sh
\ No newline at end of file
+../tcwg-base/build.sh
\ No newline at end of file
diff --git a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/build.sh b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/build.sh
index fa671768..50162e02 120000
--- a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/build.sh
+++ b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/build.sh
@@ -1 +1 @@
-../../tcwg-base/tcwg-build/build-image.sh
\ No newline at end of file
+../../tcwg-base/tcwg-build/build.sh
\ No newline at end of file
diff --git a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/trusty-arm64-tcwg-test/build.sh b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/trusty-arm64-tcwg-test/build.sh
index 09a87d71..4fe882e6 120000
--- a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/trusty-arm64-tcwg-test/build.sh
+++ b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-build/trusty-arm64-tcwg-test/build.sh
@@ -1 +1 @@
-../../../tcwg-base/tcwg-build/build-image.sh
\ No newline at end of file
+../../../tcwg-base/tcwg-build/build.sh
\ No newline at end of file
diff --git a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-dev/build.sh b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-dev/build.sh
index 663ce893..e8571a37 120000
--- a/trusty-arm64-tcwg-base/trusty-arm64-tcwg-dev/build.sh
+++ b/trusty-arm64-tcwg-base/trusty-arm64-tcwg-dev/build.sh
@@ -1 +1 @@
-../../tcwg-base/tcwg-dev/build-image.sh
\ No newline at end of file
+../../tcwg-base/tcwg-dev/build.sh
\ No newline at end of file
diff --git a/trusty-armhf-tcwg-base/build.sh b/trusty-armhf-tcwg-base/build.sh
index d12245ba..67d8934e 120000
--- a/trusty-armhf-tcwg-base/build.sh
+++ b/trusty-armhf-tcwg-base/build.sh
@@ -1 +1 @@
-../tcwg-base/build-image.sh
\ No newline at end of file
+../tcwg-base/build.sh
\ No newline at end of file
diff --git a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/build.sh b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/build.sh
index fa671768..50162e02 120000
--- a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/build.sh
+++ b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/build.sh
@@ -1 +1 @@
-../../tcwg-base/tcwg-build/build-image.sh
\ No newline at end of file
+../../tcwg-base/tcwg-build/build.sh
\ No newline at end of file
diff --git a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/trusty-armhf-tcwg-test/build.sh b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/trusty-armhf-tcwg-test/build.sh
index 09a87d71..4fe882e6 120000
--- a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/trusty-armhf-tcwg-test/build.sh
+++ b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-build/trusty-armhf-tcwg-test/build.sh
@@ -1 +1 @@
-../../../tcwg-base/tcwg-build/build-image.sh
\ No newline at end of file
+../../../tcwg-base/tcwg-build/build.sh
\ No newline at end of file
diff --git a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-dev/build.sh b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-dev/build.sh
index 663ce893..e8571a37 120000
--- a/trusty-armhf-tcwg-base/trusty-armhf-tcwg-dev/build.sh
+++ b/trusty-armhf-tcwg-base/trusty-armhf-tcwg-dev/build.sh
@@ -1 +1 @@
-../../tcwg-base/tcwg-dev/build-image.sh
\ No newline at end of file
+../../tcwg-base/tcwg-dev/build.sh
\ No newline at end of file
diff --git a/trusty-i386-tcwg-base/build.sh b/trusty-i386-tcwg-base/build.sh
index d12245ba..67d8934e 120000
--- a/trusty-i386-tcwg-base/build.sh
+++ b/trusty-i386-tcwg-base/build.sh
@@ -1 +1 @@
-../tcwg-base/build-image.sh
\ No newline at end of file
+../tcwg-base/build.sh
\ No newline at end of file
diff --git a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/build.sh b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/build.sh
index fa671768..50162e02 120000
--- a/trusty-i386-tcwg-base/trusty-i386-tcwg-build/build.sh
+++ b/trusty-i386-tcwg-base/trusty-i386-tcwg-build/build.sh
@@ -1 +1 @@
-../../tcwg-base/tcwg-build/build-image.sh
\ No newline at end of file
+../../tcwg-base/tcwg-build/build.sh
\ No newline at end of file
diff --git a/xenial-amd64-tcwg-base/build.sh b/xenial-amd64-tcwg-base/build.sh
index d12245ba..67d8934e 120000
--- a/xenial-amd64-tcwg-base/build.sh
+++ b/xenial-amd64-tcwg-base/build.sh
@@ -1 +1 @@
-../tcwg-base/build-image.sh
\ No newline at end of file
+../tcwg-base/build.sh
\ No newline at end of file
diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/build.sh b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/build.sh
index fa671768..50162e02 120000
--- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/build.sh
+++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-build/build.sh
@@ -1 +1 @@
-../../tcwg-base/tcwg-build/build-image.sh
\ No newline at end of file
+../../tcwg-base/tcwg-build/build.sh
\ No newline at end of file
diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/build.sh b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/build.sh
index 663ce893..e8571a37 120000
--- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/build.sh
+++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/build.sh
@@ -1 +1 @@
-../../tcwg-base/tcwg-dev/build-image.sh
\ No newline at end of file
+../../tcwg-base/tcwg-dev/build.sh
\ No newline at end of file
diff --git a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/build.sh b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/build.sh
index 277b8a94..a36ea167 120000
--- a/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/build.sh
+++ b/xenial-amd64-tcwg-base/xenial-amd64-tcwg-dev/xenial-amd64-tcwg-x2go/build.sh
@@ -1 +1 @@
-../../../tcwg-base/tcwg-dev/build-image.sh
\ No newline at end of file
+../../../tcwg-base/tcwg-dev/build.sh
\ No newline at end of file
diff --git a/xenial-arm64-tcwg-base/build.sh b/xenial-arm64-tcwg-base/build.sh
index d12245ba..67d8934e 120000
--- a/xenial-arm64-tcwg-base/build.sh
+++ b/xenial-arm64-tcwg-base/build.sh
@@ -1 +1 @@
-../tcwg-base/build-image.sh
\ No newline at end of file
+../tcwg-base/build.sh
\ No newline at end of file
diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/build.sh b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/build.sh
index fa671768..50162e02 120000
--- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/build.sh
+++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/build.sh
@@ -1 +1 @@
-../../tcwg-base/tcwg-build/build-image.sh
\ No newline at end of file
+../../tcwg-base/tcwg-build/build.sh
\ No newline at end of file
diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/xenial-arm64-tcwg-test/build.sh b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/xenial-arm64-tcwg-test/build.sh
index 09a87d71..4fe882e6 120000
--- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/xenial-arm64-tcwg-test/build.sh
+++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-build/xenial-arm64-tcwg-test/build.sh
@@ -1 +1 @@
-../../../tcwg-base/tcwg-build/build-image.sh
\ No newline at end of file
+../../../tcwg-base/tcwg-build/build.sh
\ No newline at end of file
diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/build.sh b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/build.sh
index 663ce893..e8571a37 120000
--- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/build.sh
+++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-dev/build.sh
@@ -1 +1 @@
-../../tcwg-base/tcwg-dev/build-image.sh
\ No newline at end of file
+../../tcwg-base/tcwg-dev/build.sh
\ No newline at end of file
diff --git a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/build.sh b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/build.sh
index be20c14a..cb3c7a8c 120000
--- a/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/build.sh
+++ b/xenial-arm64-tcwg-base/xenial-arm64-tcwg-llvmbot/build.sh
@@ -1 +1 @@
-../../tcwg-base/tcwg-llvmbot/build-image.sh
\ No newline at end of file
+../../tcwg-base/tcwg-llvmbot/build.sh
\ No newline at end of file
diff --git a/xenial-armhf-tcwg-base/build.sh b/xenial-armhf-tcwg-base/build.sh
index d12245ba..67d8934e 120000
--- a/xenial-armhf-tcwg-base/build.sh
+++ b/xenial-armhf-tcwg-base/build.sh
@@ -1 +1 @@
-../tcwg-base/build-image.sh
\ No newline at end of file
+../tcwg-base/build.sh
\ No newline at end of file
diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/build.sh b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/build.sh
index fa671768..50162e02 120000
--- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/build.sh
+++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/build.sh
@@ -1 +1 @@
-../../tcwg-base/tcwg-build/build-image.sh
\ No newline at end of file
+../../tcwg-base/tcwg-build/build.sh
\ No newline at end of file
diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/xenial-armhf-tcwg-test/build.sh b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/xenial-armhf-tcwg-test/build.sh
index 09a87d71..4fe882e6 120000
--- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/xenial-armhf-tcwg-test/build.sh
+++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-build/xenial-armhf-tcwg-test/build.sh
@@ -1 +1 @@
-../../../tcwg-base/tcwg-build/build-image.sh
\ No newline at end of file
+../../../tcwg-base/tcwg-build/build.sh
\ No newline at end of file
diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-dev/build.sh b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-dev/build.sh
index 663ce893..e8571a37 120000
--- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-dev/build.sh
+++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-dev/build.sh
@@ -1 +1 @@
-../../tcwg-base/tcwg-dev/build-image.sh
\ No newline at end of file
+../../tcwg-base/tcwg-dev/build.sh
\ No newline at end of file
diff --git a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/build.sh b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/build.sh
index be20c14a..cb3c7a8c 120000
--- a/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/build.sh
+++ b/xenial-armhf-tcwg-base/xenial-armhf-tcwg-llvmbot/build.sh
@@ -1 +1 @@
-../../tcwg-base/tcwg-llvmbot/build-image.sh
\ No newline at end of file
+../../tcwg-base/tcwg-llvmbot/build.sh
\ No newline at end of file
diff --git a/xenial-i386-tcwg-base/build.sh b/xenial-i386-tcwg-base/build.sh
index d12245ba..67d8934e 120000
--- a/xenial-i386-tcwg-base/build.sh
+++ b/xenial-i386-tcwg-base/build.sh
@@ -1 +1 @@
-../tcwg-base/build-image.sh
\ No newline at end of file
+../tcwg-base/build.sh
\ No newline at end of file
diff --git a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/build.sh b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/build.sh
index fa671768..50162e02 120000
--- a/xenial-i386-tcwg-base/xenial-i386-tcwg-build/build.sh
+++ b/xenial-i386-tcwg-base/xenial-i386-tcwg-build/build.sh
@@ -1 +1 @@
-../../tcwg-base/tcwg-build/build-image.sh
\ No newline at end of file
+../../tcwg-base/tcwg-build/build.sh
\ No newline at end of file
diff --git a/zesty-arm64-tcwg-base/build.sh b/zesty-arm64-tcwg-base/build.sh
index d12245ba..67d8934e 120000
--- a/zesty-arm64-tcwg-base/build.sh
+++ b/zesty-arm64-tcwg-base/build.sh
@@ -1 +1 @@
-../tcwg-base/build-image.sh
\ No newline at end of file
+../tcwg-base/build.sh
\ No newline at end of file
diff --git a/zesty-arm64-tcwg-base/zesty-arm64-tcwg-build/build.sh b/zesty-arm64-tcwg-base/zesty-arm64-tcwg-build/build.sh
index fa671768..50162e02 120000
--- a/zesty-arm64-tcwg-base/zesty-arm64-tcwg-build/build.sh
+++ b/zesty-arm64-tcwg-base/zesty-arm64-tcwg-build/build.sh
@@ -1 +1 @@
-../../tcwg-base/tcwg-build/build-image.sh
\ No newline at end of file
+../../tcwg-base/tcwg-build/build.sh
\ No newline at end of file
diff --git a/zesty-arm64-tcwg-base/zesty-arm64-tcwg-build/zesty-arm64-tcwg-test/build.sh b/zesty-arm64-tcwg-base/zesty-arm64-tcwg-build/zesty-arm64-tcwg-test/build.sh
index 09a87d71..4fe882e6 120000
--- a/zesty-arm64-tcwg-base/zesty-arm64-tcwg-build/zesty-arm64-tcwg-test/build.sh
+++ b/zesty-arm64-tcwg-base/zesty-arm64-tcwg-build/zesty-arm64-tcwg-test/build.sh
@@ -1 +1 @@
-../../../tcwg-base/tcwg-build/build-image.sh
\ No newline at end of file
+../../../tcwg-base/tcwg-build/build.sh
\ No newline at end of file
diff --git a/zesty-arm64-tcwg-base/zesty-arm64-tcwg-dev/build.sh b/zesty-arm64-tcwg-base/zesty-arm64-tcwg-dev/build.sh
index 663ce893..e8571a37 120000
--- a/zesty-arm64-tcwg-base/zesty-arm64-tcwg-dev/build.sh
+++ b/zesty-arm64-tcwg-base/zesty-arm64-tcwg-dev/build.sh
@@ -1 +1 @@
-../../tcwg-base/tcwg-dev/build-image.sh
\ No newline at end of file
+../../tcwg-base/tcwg-dev/build.sh
\ No newline at end of file
diff --git a/zesty-armhf-tcwg-base/build.sh b/zesty-armhf-tcwg-base/build.sh
index d12245ba..67d8934e 120000
--- a/zesty-armhf-tcwg-base/build.sh
+++ b/zesty-armhf-tcwg-base/build.sh
@@ -1 +1 @@
-../tcwg-base/build-image.sh
\ No newline at end of file
+../tcwg-base/build.sh
\ No newline at end of file
diff --git a/zesty-armhf-tcwg-base/zesty-armhf-tcwg-build/build.sh b/zesty-armhf-tcwg-base/zesty-armhf-tcwg-build/build.sh
index fa671768..50162e02 120000
--- a/zesty-armhf-tcwg-base/zesty-armhf-tcwg-build/build.sh
+++ b/zesty-armhf-tcwg-base/zesty-armhf-tcwg-build/build.sh
@@ -1 +1 @@
-../../tcwg-base/tcwg-build/build-image.sh
\ No newline at end of file
+../../tcwg-base/tcwg-build/build.sh
\ No newline at end of file
diff --git a/zesty-armhf-tcwg-base/zesty-armhf-tcwg-build/zesty-armhf-tcwg-test/build.sh b/zesty-armhf-tcwg-base/zesty-armhf-tcwg-build/zesty-armhf-tcwg-test/build.sh
index 09a87d71..4fe882e6 120000
--- a/zesty-armhf-tcwg-base/zesty-armhf-tcwg-build/zesty-armhf-tcwg-test/build.sh
+++ b/zesty-armhf-tcwg-base/zesty-armhf-tcwg-build/zesty-armhf-tcwg-test/build.sh
@@ -1 +1 @@
-../../../tcwg-base/tcwg-build/build-image.sh
\ No newline at end of file
+../../../tcwg-base/tcwg-build/build.sh
\ No newline at end of file
diff --git a/zesty-armhf-tcwg-base/zesty-armhf-tcwg-dev/build.sh b/zesty-armhf-tcwg-base/zesty-armhf-tcwg-dev/build.sh
index 663ce893..e8571a37 120000
--- a/zesty-armhf-tcwg-base/zesty-armhf-tcwg-dev/build.sh
+++ b/zesty-armhf-tcwg-base/zesty-armhf-tcwg-dev/build.sh
@@ -1 +1 @@
-../../tcwg-base/tcwg-dev/build-image.sh
\ No newline at end of file
+../../tcwg-base/tcwg-dev/build.sh
\ No newline at end of file