tcwg-base: Add symlinks with version numbers for autotools

So that we have autoconf-2.69 as a link to autoconf etc...

This would enable us to use Sourceware's autoregen.py which is the
script they use in their bot to detect commits which didn't correctly
run autotools.

We may want to use the same script in our precommit CI.

Change-Id: I5ab639858d9a90b2f70d42a3daca9dd9ac2ee873

7 files changed, 76 insertions, 20 deletions

diff --git a/focal-amd64-tcwg-base/Dockerfile b/focal-amd64-tcwg-base/Dockerfile
index 81072bac..8f3e23d0 100644
--- a/focal-amd64-tcwg-base/Dockerfile
+++ b/focal-amd64-tcwg-base/Dockerfile
@@ -272,7 +272,7 @@ RUN curl -f -o $(git --exec-path)/git-filter-repo \
 # libtool-2.2.7a which is not available either.  Build succeeds in
 # with --enable-maintainer-mode and the system versions of libtool and
 # gettext, so rely on them.
-RUN autoconf_ver=autoconf-2.69 \
+RUN autoconf_version=2.69 autoconf_ver=autoconf-${autoconf_version}  \
  && cd /usr/local \
  && wget https://ftp.gnu.org/gnu/autoconf/${autoconf_ver}.tar.xz \
  && cd /tmp \
@@ -282,8 +282,12 @@ RUN autoconf_ver=autoconf-2.69 \
  && cd build \
  && ../configure --prefix=/usr/local/${autoconf_ver} \
  && make install \
+ && cd /usr/local/${autoconf_ver}/bin \
+ && for f in autoconf autoheader autom4te autoreconf autoscan autoupdate ifnames; do \
+      ln -sv $f $f-${autoconf_version} ; \
+    done \
  && rm -f /usr/local/${autoconf_ver}.tar.xz \
- && automake_ver=automake-1.15.1 \
+ && automake_version=1.15.1 automake_ver=automake-${automake_version} \
  && cd /usr/local \
  && wget https://ftp.gnu.org/gnu/automake/${automake_ver}.tar.xz \
  && cd /tmp \
@@ -293,6 +297,10 @@ RUN autoconf_ver=autoconf-2.69 \
  && cd build \
  && ../configure --prefix=/usr/local/${automake_ver} \
  && make install \
+ && cd /usr/local/${automake_ver}/bin \
+ && for f in aclocal automake; do \
+      ln -sv $f $f-${automake_version} ; \
+    done \
  && rm -f /usr/local/${automake_ver}.tar.xz \
  && rm -rf /tmp/${autoconf_ver} /tmp/${automake_ver}
 COPY home-data/ /home-data/
@@ -317,4 +325,4 @@ VOLUME /tmp
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
 # This is a dummy comment to trigger a base image rebuild.
-# checksum: e405d1c3eb54b88abd5a98e545a96d39
+# checksum: a3189ffcf2a879f188230ca64162be43
diff --git a/focal-arm64-tcwg-base/Dockerfile b/focal-arm64-tcwg-base/Dockerfile
index 0f4b144f..76400f48 100644
--- a/focal-arm64-tcwg-base/Dockerfile
+++ b/focal-arm64-tcwg-base/Dockerfile
@@ -253,7 +253,7 @@ RUN curl -f -o $(git --exec-path)/git-filter-repo \
 # libtool-2.2.7a which is not available either.  Build succeeds in
 # with --enable-maintainer-mode and the system versions of libtool and
 # gettext, so rely on them.
-RUN autoconf_ver=autoconf-2.69 \
+RUN autoconf_version=2.69 autoconf_ver=autoconf-${autoconf_version}  \
  && cd /usr/local \
  && wget https://ftp.gnu.org/gnu/autoconf/${autoconf_ver}.tar.xz \
  && cd /tmp \
@@ -263,8 +263,12 @@ RUN autoconf_ver=autoconf-2.69 \
  && cd build \
  && ../configure --prefix=/usr/local/${autoconf_ver} \
  && make install \
+ && cd /usr/local/${autoconf_ver}/bin \
+ && for f in autoconf autoheader autom4te autoreconf autoscan autoupdate ifnames; do \
+      ln -sv $f $f-${autoconf_version} ; \
+    done \
  && rm -f /usr/local/${autoconf_ver}.tar.xz \
- && automake_ver=automake-1.15.1 \
+ && automake_version=1.15.1 automake_ver=automake-${automake_version} \
  && cd /usr/local \
  && wget https://ftp.gnu.org/gnu/automake/${automake_ver}.tar.xz \
  && cd /tmp \
@@ -274,6 +278,10 @@ RUN autoconf_ver=autoconf-2.69 \
  && cd build \
  && ../configure --prefix=/usr/local/${automake_ver} \
  && make install \
+ && cd /usr/local/${automake_ver}/bin \
+ && for f in aclocal automake; do \
+      ln -sv $f $f-${automake_version} ; \
+    done \
  && rm -f /usr/local/${automake_ver}.tar.xz \
  && rm -rf /tmp/${autoconf_ver} /tmp/${automake_ver}
 COPY home-data/ /home-data/
@@ -298,4 +306,4 @@ VOLUME /tmp
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
 # This is a dummy comment to trigger a base image rebuild.
-# checksum: 4e5457342fb63cd068dc25cc4dbf777c
+# checksum: c38eece402c64fa2c214420831b4775d
diff --git a/focal-armhf-tcwg-base/Dockerfile b/focal-armhf-tcwg-base/Dockerfile
index 6ee52d45..7de45301 100644
--- a/focal-armhf-tcwg-base/Dockerfile
+++ b/focal-armhf-tcwg-base/Dockerfile
@@ -250,7 +250,7 @@ RUN curl -f -o $(git --exec-path)/git-filter-repo \
 # libtool-2.2.7a which is not available either.  Build succeeds in
 # with --enable-maintainer-mode and the system versions of libtool and
 # gettext, so rely on them.
-RUN autoconf_ver=autoconf-2.69 \
+RUN autoconf_version=2.69 autoconf_ver=autoconf-${autoconf_version}  \
  && cd /usr/local \
  && wget https://ftp.gnu.org/gnu/autoconf/${autoconf_ver}.tar.xz \
  && cd /tmp \
@@ -260,8 +260,12 @@ RUN autoconf_ver=autoconf-2.69 \
  && cd build \
  && ../configure --prefix=/usr/local/${autoconf_ver} \
  && make install \
+ && cd /usr/local/${autoconf_ver}/bin \
+ && for f in autoconf autoheader autom4te autoreconf autoscan autoupdate ifnames; do \
+      ln -sv $f $f-${autoconf_version} ; \
+    done \
  && rm -f /usr/local/${autoconf_ver}.tar.xz \
- && automake_ver=automake-1.15.1 \
+ && automake_version=1.15.1 automake_ver=automake-${automake_version} \
  && cd /usr/local \
  && wget https://ftp.gnu.org/gnu/automake/${automake_ver}.tar.xz \
  && cd /tmp \
@@ -271,6 +275,10 @@ RUN autoconf_ver=autoconf-2.69 \
  && cd build \
  && ../configure --prefix=/usr/local/${automake_ver} \
  && make install \
+ && cd /usr/local/${automake_ver}/bin \
+ && for f in aclocal automake; do \
+      ln -sv $f $f-${automake_version} ; \
+    done \
  && rm -f /usr/local/${automake_ver}.tar.xz \
  && rm -rf /tmp/${autoconf_ver} /tmp/${automake_ver}
 COPY home-data/ /home-data/
@@ -304,4 +312,4 @@ VOLUME /tmp
 EXPOSE 22
 CMD ["linux32", "/usr/sbin/sshd", "-D"]
 # This is a dummy comment to trigger a base image rebuild.
-# checksum: 9722a21b21cf6bdf5803fe116375a57d
+# checksum: 33dcd3b146cf6b5229a189e1c404e8ee
diff --git a/jammy-amd64-tcwg-base/Dockerfile b/jammy-amd64-tcwg-base/Dockerfile
index 664e16c1..b4401bc7 100644
--- a/jammy-amd64-tcwg-base/Dockerfile
+++ b/jammy-amd64-tcwg-base/Dockerfile
@@ -274,7 +274,7 @@ RUN cd /tmp \
 # libtool-2.2.7a which is not available either.  Build succeeds in
 # with --enable-maintainer-mode and the system versions of libtool and
 # gettext, so rely on them.
-RUN autoconf_ver=autoconf-2.69 \
+RUN autoconf_version=2.69 autoconf_ver=autoconf-${autoconf_version}  \
  && cd /usr/local \
  && wget https://ftp.gnu.org/gnu/autoconf/${autoconf_ver}.tar.xz \
  && cd /tmp \
@@ -284,8 +284,12 @@ RUN autoconf_ver=autoconf-2.69 \
  && cd build \
  && ../configure --prefix=/usr/local/${autoconf_ver} \
  && make install \
+ && cd /usr/local/${autoconf_ver}/bin \
+ && for f in autoconf autoheader autom4te autoreconf autoscan autoupdate ifnames; do \
+      ln -sv $f $f-${autoconf_version} ; \
+    done \
  && rm -f /usr/local/${autoconf_ver}.tar.xz \
- && automake_ver=automake-1.15.1 \
+ && automake_version=1.15.1 automake_ver=automake-${automake_version} \
  && cd /usr/local \
  && wget https://ftp.gnu.org/gnu/automake/${automake_ver}.tar.xz \
  && cd /tmp \
@@ -295,6 +299,10 @@ RUN autoconf_ver=autoconf-2.69 \
  && cd build \
  && ../configure --prefix=/usr/local/${automake_ver} \
  && make install \
+ && cd /usr/local/${automake_ver}/bin \
+ && for f in aclocal automake; do \
+      ln -sv $f $f-${automake_version} ; \
+    done \
  && rm -f /usr/local/${automake_ver}.tar.xz \
  && rm -rf /tmp/${autoconf_ver} /tmp/${automake_ver}
 COPY home-data/ /home-data/
@@ -319,4 +327,4 @@ VOLUME /tmp
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
 # This is a dummy comment to trigger a base image rebuild.
-# checksum: a24fb905a1ba576d8d02351a6c47aa29
+# checksum: 6abe91c402501929753104a36a53da66
diff --git a/jammy-arm64-tcwg-base/Dockerfile b/jammy-arm64-tcwg-base/Dockerfile
index 06af1398..4c939f20 100644
--- a/jammy-arm64-tcwg-base/Dockerfile
+++ b/jammy-arm64-tcwg-base/Dockerfile
@@ -255,7 +255,7 @@ RUN git clone https://github.com/rovka/libpgmath-binaries.git \
 # libtool-2.2.7a which is not available either.  Build succeeds in
 # with --enable-maintainer-mode and the system versions of libtool and
 # gettext, so rely on them.
-RUN autoconf_ver=autoconf-2.69 \
+RUN autoconf_version=2.69 autoconf_ver=autoconf-${autoconf_version}  \
  && cd /usr/local \
  && wget https://ftp.gnu.org/gnu/autoconf/${autoconf_ver}.tar.xz \
  && cd /tmp \
@@ -265,8 +265,12 @@ RUN autoconf_ver=autoconf-2.69 \
  && cd build \
  && ../configure --prefix=/usr/local/${autoconf_ver} \
  && make install \
+ && cd /usr/local/${autoconf_ver}/bin \
+ && for f in autoconf autoheader autom4te autoreconf autoscan autoupdate ifnames; do \
+      ln -sv $f $f-${autoconf_version} ; \
+    done \
  && rm -f /usr/local/${autoconf_ver}.tar.xz \
- && automake_ver=automake-1.15.1 \
+ && automake_version=1.15.1 automake_ver=automake-${automake_version} \
  && cd /usr/local \
  && wget https://ftp.gnu.org/gnu/automake/${automake_ver}.tar.xz \
  && cd /tmp \
@@ -276,6 +280,10 @@ RUN autoconf_ver=autoconf-2.69 \
  && cd build \
  && ../configure --prefix=/usr/local/${automake_ver} \
  && make install \
+ && cd /usr/local/${automake_ver}/bin \
+ && for f in aclocal automake; do \
+      ln -sv $f $f-${automake_version} ; \
+    done \
  && rm -f /usr/local/${automake_ver}.tar.xz \
  && rm -rf /tmp/${autoconf_ver} /tmp/${automake_ver}
 COPY home-data/ /home-data/
@@ -300,4 +308,4 @@ VOLUME /tmp
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
 # This is a dummy comment to trigger a base image rebuild.
-# checksum: f1b1a272ecce6dcba869eccd95481f53
+# checksum: ff825fc7d2c78670adfaff39d0d05a90
diff --git a/jammy-armhf-tcwg-base/Dockerfile b/jammy-armhf-tcwg-base/Dockerfile
index a9aeb547..78e356d5 100644
--- a/jammy-armhf-tcwg-base/Dockerfile
+++ b/jammy-armhf-tcwg-base/Dockerfile
@@ -256,7 +256,7 @@ RUN \
 # libtool-2.2.7a which is not available either.  Build succeeds in
 # with --enable-maintainer-mode and the system versions of libtool and
 # gettext, so rely on them.
-RUN autoconf_ver=autoconf-2.69 \
+RUN autoconf_version=2.69 autoconf_ver=autoconf-${autoconf_version}  \
  && cd /usr/local \
  && wget https://ftp.gnu.org/gnu/autoconf/${autoconf_ver}.tar.xz \
  && cd /tmp \
@@ -266,8 +266,12 @@ RUN autoconf_ver=autoconf-2.69 \
  && cd build \
  && ../configure --prefix=/usr/local/${autoconf_ver} \
  && make install \
+ && cd /usr/local/${autoconf_ver}/bin \
+ && for f in autoconf autoheader autom4te autoreconf autoscan autoupdate ifnames; do \
+      ln -sv $f $f-${autoconf_version} ; \
+    done \
  && rm -f /usr/local/${autoconf_ver}.tar.xz \
- && automake_ver=automake-1.15.1 \
+ && automake_version=1.15.1 automake_ver=automake-${automake_version} \
  && cd /usr/local \
  && wget https://ftp.gnu.org/gnu/automake/${automake_ver}.tar.xz \
  && cd /tmp \
@@ -277,6 +281,10 @@ RUN autoconf_ver=autoconf-2.69 \
  && cd build \
  && ../configure --prefix=/usr/local/${automake_ver} \
  && make install \
+ && cd /usr/local/${automake_ver}/bin \
+ && for f in aclocal automake; do \
+      ln -sv $f $f-${automake_version} ; \
+    done \
  && rm -f /usr/local/${automake_ver}.tar.xz \
  && rm -rf /tmp/${autoconf_ver} /tmp/${automake_ver}
 COPY home-data/ /home-data/
@@ -310,4 +318,4 @@ VOLUME /tmp
 EXPOSE 22
 CMD ["linux32", "/usr/sbin/sshd", "-D"]
 # This is a dummy comment to trigger a base image rebuild.
-# checksum: ca65ab54d6c1040c0f52c490d141deac
+# checksum: c703892b252d152771e3928eb17e2f65
diff --git a/tcwg-base/Dockerfile.in b/tcwg-base/Dockerfile.in
index 0e4fd071..31b1a18d 100644
--- a/tcwg-base/Dockerfile.in
+++ b/tcwg-base/Dockerfile.in
@@ -351,7 +351,7 @@ RUN curl -f -o $(git --exec-path)/git-filter-repo \
 # libtool-2.2.7a which is not available either.  Build succeeds in
 # with --enable-maintainer-mode and the system versions of libtool and
 # gettext, so rely on them.
-RUN autoconf_ver=autoconf-2.69 \
+RUN autoconf_version=2.69 autoconf_ver=autoconf-${autoconf_version}  \
  && cd /usr/local \
  && wget https://ftp.gnu.org/gnu/autoconf/${autoconf_ver}.tar.xz \
  && cd /tmp \
@@ -361,8 +361,12 @@ RUN autoconf_ver=autoconf-2.69 \
  && cd build \
  && ../configure --prefix=/usr/local/${autoconf_ver} \
  && make install \
+ && cd /usr/local/${autoconf_ver}/bin \
+ && for f in autoconf autoheader autom4te autoreconf autoscan autoupdate ifnames; do \
+      ln -sv $f $f-${autoconf_version} ; \
+    done \
  && rm -f /usr/local/${autoconf_ver}.tar.xz \
- && automake_ver=automake-1.15.1 \
+ && automake_version=1.15.1 automake_ver=automake-${automake_version} \
  && cd /usr/local \
  && wget https://ftp.gnu.org/gnu/automake/${automake_ver}.tar.xz \
  && cd /tmp \
@@ -372,6 +376,10 @@ RUN autoconf_ver=autoconf-2.69 \
  && cd build \
  && ../configure --prefix=/usr/local/${automake_ver} \
  && make install \
+ && cd /usr/local/${automake_ver}/bin \
+ && for f in aclocal automake; do \
+      ln -sv $f $f-${automake_version} ; \
+    done \
  && rm -f /usr/local/${automake_ver}.tar.xz \
  && rm -rf /tmp/${autoconf_ver} /tmp/${automake_ver}