[COMMITTED] bb-start.sh: Always add some versions to the info files

[COMMITTED] bb-start.sh: Always add some versions to the info files

[Mark Wielaard]

Now that it is easier to hack on the bb-start.sh file make sure the
info files are always updated and that we add the versions of gcc,
binutils and glibc in the container image.
---
 builder/containers/bb-start.sh | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/builder/containers/bb-start.sh b/builder/containers/bb-start.sh
index f8203ef..31cdbc9 100755
--- a/builder/containers/bb-start.sh
+++ b/builder/containers/bb-start.sh
@@ -12,12 +12,22 @@ tac_file=$worker_dir/buildbot.tac
 if [ ! -f $tac_file ]; then
   mkdir -p $worker_dir
   buildbot-worker create-worker $worker_dir $BUILDMASTER:$BUILDMASTER_PORT $WORKERNAME $WORKERPASS
-  echo buildbot@sourceware.org > $worker_dir/info/admin
-  echo $IMAGE_NAME > $worker_dir/info/host
 else
   sed -ie "s/^passwd = .*/passwd = '$WORKERPASS'/" $tac_file
 fi
+
+# Fill in the info visible in the buildbot website
+# objcopy gives us the binutils version, iconv the glibc version
+echo buildbot@sourceware.org > $worker_dir/info/admin
+echo $IMAGE_NAME > $worker_dir/info/host
+gcc --version | head -1 >> $worker_dir/info/host
+objcopy --version | head -1 >> $worker_dir/info/host
+iconv --version | head -1 >> $worker_dir/info/host
+
+# We don't want to leak this in any logs
 unset WORKERPASS
+
+# Make sure ccache is in the PATH and uses a shared cache
 export PATH=$CCACHE_LIBDIR:$PATH
 mkdir -p shared/$IMAGE_NAME/ccache
 export CCACHE_DIR=/home/builder/shared/$IMAGE_NAME/ccache
-- 
2.30.2