From 473e7fba3cf6321dd4c7bbef31cd23b33e08c0e9 Mon Sep 17 00:00:00 2001
From: Maxim Kuvyrkov <maxim.kuvyrkov@linaro.org>
Date: Wed, 13 Mar 2024 07:43:04 +0000
Subject: tcwg-base: Fix gnat version

... to GCC's configure test "gcc -c conftest.adb" to pass,
and enable building ada language in tcwg_gnu_native_* CI.

Change-Id: Ief867b9d6bfd000975774dc1ae58e3db4cc74dc8
---
 focal-amd64-tcwg-base/focal-amd64-tcwg-dev/Dockerfile | 3 +--
 focal-arm64-tcwg-base/focal-arm64-tcwg-dev/Dockerfile | 3 +--
 focal-armhf-tcwg-base/focal-armhf-tcwg-dev/Dockerfile | 3 +--
 jammy-amd64-tcwg-base/Dockerfile                      | 6 ++++--
 jammy-amd64-tcwg-base/jammy-amd64-tcwg-dev/Dockerfile | 3 +--
 jammy-arm64-tcwg-base/Dockerfile                      | 6 ++++--
 jammy-arm64-tcwg-base/jammy-arm64-tcwg-dev/Dockerfile | 3 +--
 jammy-armhf-tcwg-base/Dockerfile                      | 6 ++++--
 jammy-armhf-tcwg-base/jammy-armhf-tcwg-dev/Dockerfile | 3 +--
 tcwg-base/Dockerfile.in                               | 6 ++++++
 tcwg-base/tcwg-dev/Dockerfile.in                      | 1 -
 11 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/focal-amd64-tcwg-base/focal-amd64-tcwg-dev/Dockerfile b/focal-amd64-tcwg-base/focal-amd64-tcwg-dev/Dockerfile
index faa99c22..0ab65b89 100644
--- a/focal-amd64-tcwg-base/focal-amd64-tcwg-dev/Dockerfile
+++ b/focal-amd64-tcwg-base/focal-amd64-tcwg-dev/Dockerfile
@@ -8,7 +8,6 @@ RUN apt-get update \
  git-email \
  git-gui \
  git-svn \
- gnat \
  htop \
  iputils-ping \
  iputils-tracepath \
@@ -30,4 +29,4 @@ RUN apt-file update
 COPY run.sh start.sh /
 ENTRYPOINT ["/run.sh"]
 CMD ["start.sh"]
-# checksum: 35fc49eeec68ad8690970b40e211665c
+# checksum: f148147f369faf7dc19e6471b4c4beb3
diff --git a/focal-arm64-tcwg-base/focal-arm64-tcwg-dev/Dockerfile b/focal-arm64-tcwg-base/focal-arm64-tcwg-dev/Dockerfile
index 0b796347..fd73b74e 100644
--- a/focal-arm64-tcwg-base/focal-arm64-tcwg-dev/Dockerfile
+++ b/focal-arm64-tcwg-base/focal-arm64-tcwg-dev/Dockerfile
@@ -8,7 +8,6 @@ RUN apt-get update \
  git-email \
  git-gui \
  git-svn \
- gnat \
  htop \
  iputils-ping \
  iputils-tracepath \
@@ -30,4 +29,4 @@ RUN apt-file update
 COPY run.sh start.sh /
 ENTRYPOINT ["/run.sh"]
 CMD ["start.sh"]
-# checksum: 3206bf5ee5fa9bf300732f459cddc00a
+# checksum: 6e9bcbce53da0cec83d927a0d4ce4b9c
diff --git a/focal-armhf-tcwg-base/focal-armhf-tcwg-dev/Dockerfile b/focal-armhf-tcwg-base/focal-armhf-tcwg-dev/Dockerfile
index bc695007..2e9fdfe1 100644
--- a/focal-armhf-tcwg-base/focal-armhf-tcwg-dev/Dockerfile
+++ b/focal-armhf-tcwg-base/focal-armhf-tcwg-dev/Dockerfile
@@ -8,7 +8,6 @@ RUN apt-get update \
  git-email \
  git-gui \
  git-svn \
- gnat \
  htop \
  iputils-ping \
  iputils-tracepath \
@@ -30,4 +29,4 @@ RUN apt-file update
 COPY run.sh start.sh /
 ENTRYPOINT ["linux32", "/run.sh"]
 CMD ["start.sh"]
-# checksum: 7fefd611241c258fdcff5a82e458b7b8
+# checksum: 18f1ec3322aae4a4b71bce8e347acfc4
diff --git a/jammy-amd64-tcwg-base/Dockerfile b/jammy-amd64-tcwg-base/Dockerfile
index 39b65595..664e16c1 100644
--- a/jammy-amd64-tcwg-base/Dockerfile
+++ b/jammy-amd64-tcwg-base/Dockerfile
@@ -47,7 +47,9 @@ RUN apt-get update \
  git-annex \
  git-filter-repo \
  gm2 \
- gnat \
+ # For unknown reason "gnat" defaults to "gnat-10" in Jammy, while all other
+ # GCC packages default to "*-11" versions.
+ gnat-11 \
  gobjc \
  gobjc++ \
  golang \
@@ -317,4 +319,4 @@ VOLUME /tmp
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
 # This is a dummy comment to trigger a base image rebuild.
-# checksum: 81a22136a214ad01b589015c1f12d5a7
+# checksum: a24fb905a1ba576d8d02351a6c47aa29
diff --git a/jammy-amd64-tcwg-base/jammy-amd64-tcwg-dev/Dockerfile b/jammy-amd64-tcwg-base/jammy-amd64-tcwg-dev/Dockerfile
index 0c3c0476..47e2afba 100644
--- a/jammy-amd64-tcwg-base/jammy-amd64-tcwg-dev/Dockerfile
+++ b/jammy-amd64-tcwg-base/jammy-amd64-tcwg-dev/Dockerfile
@@ -8,7 +8,6 @@ RUN apt-get update \
  git-email \
  git-gui \
  git-svn \
- gnat \
  htop \
  iputils-ping \
  iputils-tracepath \
@@ -30,4 +29,4 @@ RUN apt-file update
 COPY run.sh start.sh /
 ENTRYPOINT ["/run.sh"]
 CMD ["start.sh"]
-# checksum: 84397f7f584364be4d0bb610d8ba7df5
+# checksum: 3e9774c1f692d5050c2693715d221784
diff --git a/jammy-arm64-tcwg-base/Dockerfile b/jammy-arm64-tcwg-base/Dockerfile
index b7d95394..06af1398 100644
--- a/jammy-arm64-tcwg-base/Dockerfile
+++ b/jammy-arm64-tcwg-base/Dockerfile
@@ -47,7 +47,9 @@ RUN apt-get update \
  git-annex \
  git-filter-repo \
  gm2 \
- gnat \
+ # For unknown reason "gnat" defaults to "gnat-10" in Jammy, while all other
+ # GCC packages default to "*-11" versions.
+ gnat-11 \
  gobjc \
  gobjc++ \
  golang \
@@ -298,4 +300,4 @@ VOLUME /tmp
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
 # This is a dummy comment to trigger a base image rebuild.
-# checksum: f8e1abb7e106023a686bac66164c1e52
+# checksum: f1b1a272ecce6dcba869eccd95481f53
diff --git a/jammy-arm64-tcwg-base/jammy-arm64-tcwg-dev/Dockerfile b/jammy-arm64-tcwg-base/jammy-arm64-tcwg-dev/Dockerfile
index 20ef7096..2e4ee88d 100644
--- a/jammy-arm64-tcwg-base/jammy-arm64-tcwg-dev/Dockerfile
+++ b/jammy-arm64-tcwg-base/jammy-arm64-tcwg-dev/Dockerfile
@@ -8,7 +8,6 @@ RUN apt-get update \
  git-email \
  git-gui \
  git-svn \
- gnat \
  htop \
  iputils-ping \
  iputils-tracepath \
@@ -30,4 +29,4 @@ RUN apt-file update
 COPY run.sh start.sh /
 ENTRYPOINT ["/run.sh"]
 CMD ["start.sh"]
-# checksum: b4dae3f5c3a7777dea71f7fc3db539f4
+# checksum: f22c2401522b340ea0a1f0a5ce4acc63
diff --git a/jammy-armhf-tcwg-base/Dockerfile b/jammy-armhf-tcwg-base/Dockerfile
index 96013549..a9aeb547 100644
--- a/jammy-armhf-tcwg-base/Dockerfile
+++ b/jammy-armhf-tcwg-base/Dockerfile
@@ -47,7 +47,9 @@ RUN apt-get update \
  git-annex \
  git-filter-repo \
  gm2 \
- gnat \
+ # For unknown reason "gnat" defaults to "gnat-10" in Jammy, while all other
+ # GCC packages default to "*-11" versions.
+ gnat-11 \
  gobjc \
  gobjc++ \
  golang \
@@ -308,4 +310,4 @@ VOLUME /tmp
 EXPOSE 22
 CMD ["linux32", "/usr/sbin/sshd", "-D"]
 # This is a dummy comment to trigger a base image rebuild.
-# checksum: e6eed90aa180657265458cfc8437bfea
+# checksum: ca65ab54d6c1040c0f52c490d141deac
diff --git a/jammy-armhf-tcwg-base/jammy-armhf-tcwg-dev/Dockerfile b/jammy-armhf-tcwg-base/jammy-armhf-tcwg-dev/Dockerfile
index 6b4ec194..ff6aa7d5 100644
--- a/jammy-armhf-tcwg-base/jammy-armhf-tcwg-dev/Dockerfile
+++ b/jammy-armhf-tcwg-base/jammy-armhf-tcwg-dev/Dockerfile
@@ -8,7 +8,6 @@ RUN apt-get update \
  git-email \
  git-gui \
  git-svn \
- gnat \
  htop \
  iputils-ping \
  iputils-tracepath \
@@ -30,4 +29,4 @@ RUN apt-file update
 COPY run.sh start.sh /
 ENTRYPOINT ["linux32", "/run.sh"]
 CMD ["start.sh"]
-# checksum: 87270421c64c68fbead3c8450c2a05c8
+# checksum: f3649c5dac3e39910388f6d8b99c7cf1
diff --git a/tcwg-base/Dockerfile.in b/tcwg-base/Dockerfile.in
index ac101f0a..0e4fd071 100644
--- a/tcwg-base/Dockerfile.in
+++ b/tcwg-base/Dockerfile.in
@@ -54,7 +54,13 @@ RUN apt-get update \
  git-filter-repo \
 #endif
  gm2 \
+#if DISTRO_jammy
+ # For unknown reason "gnat" defaults to "gnat-10" in Jammy, while all other
+ # GCC packages default to "*-11" versions.
+ gnat-11 \
+#else
  gnat \
+#endif
  gobjc \
  gobjc++ \
  golang \
diff --git a/tcwg-base/tcwg-dev/Dockerfile.in b/tcwg-base/tcwg-dev/Dockerfile.in
index b49f7d72..c17167a8 100644
--- a/tcwg-base/tcwg-dev/Dockerfile.in
+++ b/tcwg-base/tcwg-dev/Dockerfile.in
@@ -8,7 +8,6 @@ RUN apt-get update \
  git-email \
  git-gui \
  git-svn \
- gnat \
  htop \
  iputils-ping \
  iputils-tracepath \
-- 
cgit v1.2.3