tcwg-base: Move libxml2-dev and libedit-dev to base for lldb use

They were already in the llvmbot image, moving them to base
means they'll be in the dev image also.

Change-Id: I93b8353d3403219248f60ea3f22d29192d9ed415

12 files changed, 38 insertions, 20 deletions

diff --git a/focal-amd64-tcwg-base/Dockerfile b/focal-amd64-tcwg-base/Dockerfile
index f2236287..f6b81cbf 100644
--- a/focal-amd64-tcwg-base/Dockerfile
+++ b/focal-amd64-tcwg-base/Dockerfile
@@ -57,6 +57,8 @@ RUN apt-get update \
 # libc6-dbg is necessary for armhf debugging, but also helps on aarch64.
  libc6-dbg \
  libcc1-0 \
+# For building lldb.
+ libedit-dev \
  libexpat1-dev \
  libffi-dev \
  libglib2.0-dev \
@@ -78,6 +80,8 @@ RUN apt-get update \
 # focal installs libtinfo6 instead.
  libtinfo5 \
  libtool \
+# For building lldb.
+ libxml2-dev \
  llvm \
  locales \
  lzop \
@@ -311,4 +315,4 @@ VOLUME /tmp
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
 # This is a dummy comment to trigger a base image rebuild.
-# checksum: ff6b6cffca9e12a54f2bfad50ceed3df
+# checksum: a0dca9709f8dadbf901241901a1ae6f4
diff --git a/focal-arm64-tcwg-base/Dockerfile b/focal-arm64-tcwg-base/Dockerfile
index 6a1ca98d..444dc77a 100644
--- a/focal-arm64-tcwg-base/Dockerfile
+++ b/focal-arm64-tcwg-base/Dockerfile
@@ -57,6 +57,8 @@ RUN apt-get update \
 # libc6-dbg is necessary for armhf debugging, but also helps on aarch64.
  libc6-dbg \
  libcc1-0 \
+# For building lldb.
+ libedit-dev \
  libexpat1-dev \
  libffi-dev \
  libglib2.0-dev \
@@ -78,6 +80,8 @@ RUN apt-get update \
 # focal installs libtinfo6 instead.
  libtinfo5 \
  libtool \
+# For building lldb.
+ libxml2-dev \
  llvm \
  locales \
  lzop \
@@ -292,4 +296,4 @@ VOLUME /tmp
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
 # This is a dummy comment to trigger a base image rebuild.
-# checksum: cf411ca2f1a59ca78a1491f01caef5b7
+# checksum: e6e10fa74f24607a955bd1658eb359bc
diff --git a/focal-arm64-tcwg-base/focal-arm64-tcwg-llvmbot/Dockerfile b/focal-arm64-tcwg-base/focal-arm64-tcwg-llvmbot/Dockerfile
index 3a22eb60..a8f7110f 100644
--- a/focal-arm64-tcwg-base/focal-arm64-tcwg-llvmbot/Dockerfile
+++ b/focal-arm64-tcwg-base/focal-arm64-tcwg-llvmbot/Dockerfile
@@ -16,7 +16,6 @@ RUN apt-get update \
  language-pack-ja \
  language-pack-ru \
  language-pack-zh-hans \
- libedit-dev \
  libjson-perl \
  libtinfo-dev \
 # We build clang+llvm releases on Ubuntu Bionic, which has libtinfo.so.5,
@@ -27,7 +26,6 @@ RUN apt-get update \
 # We should no longer need libtinfo5 when we switch building releases to
 # Ubuntu Focal or later.
  libtinfo5 \
- libxml2-dev \
  linux-tools-common \
  python3-buildbot-worker \
  tmux \
@@ -84,4 +82,4 @@ COPY run.sh .
 COPY start.sh .
 ENTRYPOINT ["/run.sh"]
 CMD ["start.sh"]
-# checksum: 52696e4ef7058979cf370836d3e69279
+# checksum: daf14e78943eca285c168a7ade5ad322
diff --git a/focal-armhf-tcwg-base/Dockerfile b/focal-armhf-tcwg-base/Dockerfile
index df06a416..9f647b00 100644
--- a/focal-armhf-tcwg-base/Dockerfile
+++ b/focal-armhf-tcwg-base/Dockerfile
@@ -57,6 +57,8 @@ RUN apt-get update \
 # libc6-dbg is necessary for armhf debugging, but also helps on aarch64.
  libc6-dbg \
  libcc1-0 \
+# For building lldb.
+ libedit-dev \
  libexpat1-dev \
  libffi-dev \
  libglib2.0-dev \
@@ -78,6 +80,8 @@ RUN apt-get update \
 # focal installs libtinfo6 instead.
  libtinfo5 \
  libtool \
+# For building lldb.
+ libxml2-dev \
  llvm \
  locales \
  lzop \
@@ -298,4 +302,4 @@ VOLUME /tmp
 EXPOSE 22
 CMD ["linux32", "/usr/sbin/sshd", "-D"]
 # This is a dummy comment to trigger a base image rebuild.
-# checksum: 8b0afbf6d121a3be25f00fb7a6c8b56c
+# checksum: e0682530922bc303d75c596f8215e207
diff --git a/focal-armhf-tcwg-base/focal-armhf-tcwg-llvmbot/Dockerfile b/focal-armhf-tcwg-base/focal-armhf-tcwg-llvmbot/Dockerfile
index ab3fc4e3..d0b23255 100644
--- a/focal-armhf-tcwg-base/focal-armhf-tcwg-llvmbot/Dockerfile
+++ b/focal-armhf-tcwg-base/focal-armhf-tcwg-llvmbot/Dockerfile
@@ -16,7 +16,6 @@ RUN apt-get update \
  language-pack-ja \
  language-pack-ru \
  language-pack-zh-hans \
- libedit-dev \
  libjson-perl \
  libtinfo-dev \
 # We build clang+llvm releases on Ubuntu Bionic, which has libtinfo.so.5,
@@ -27,7 +26,6 @@ RUN apt-get update \
 # We should no longer need libtinfo5 when we switch building releases to
 # Ubuntu Focal or later.
  libtinfo5 \
- libxml2-dev \
  linux-tools-common \
  python3-buildbot-worker \
  tmux \
@@ -72,4 +70,4 @@ COPY run.sh .
 COPY start.sh .
 ENTRYPOINT ["linux32", "/run.sh"]
 CMD ["start.sh"]
-# checksum: cbae063b92c7b253c7de7f3699887e45
+# checksum: b01437c7168e565247503b8fd28c1e75
diff --git a/jammy-amd64-tcwg-base/Dockerfile b/jammy-amd64-tcwg-base/Dockerfile
index 801fadd9..5a55c0a4 100644
--- a/jammy-amd64-tcwg-base/Dockerfile
+++ b/jammy-amd64-tcwg-base/Dockerfile
@@ -58,6 +58,8 @@ RUN apt-get update \
 # libc6-dbg is necessary for armhf debugging, but also helps on aarch64.
  libc6-dbg \
  libcc1-0 \
+# For building lldb.
+ libedit-dev \
  libexpat1-dev \
  libffi-dev \
  libglib2.0-dev \
@@ -79,6 +81,8 @@ RUN apt-get update \
 # focal installs libtinfo6 instead.
  libtinfo5 \
  libtool \
+# For building lldb.
+ libxml2-dev \
  llvm \
  locales \
  lzop \
@@ -311,4 +315,4 @@ VOLUME /tmp
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
 # This is a dummy comment to trigger a base image rebuild.
-# checksum: 15cb74062da47ef4ffd9f8cab0129303
+# checksum: 31b3df9c311be71c0850394fbcc9cf56
diff --git a/jammy-arm64-tcwg-base/Dockerfile b/jammy-arm64-tcwg-base/Dockerfile
index 172e10fa..99a4770f 100644
--- a/jammy-arm64-tcwg-base/Dockerfile
+++ b/jammy-arm64-tcwg-base/Dockerfile
@@ -58,6 +58,8 @@ RUN apt-get update \
 # libc6-dbg is necessary for armhf debugging, but also helps on aarch64.
  libc6-dbg \
  libcc1-0 \
+# For building lldb.
+ libedit-dev \
  libexpat1-dev \
  libffi-dev \
  libglib2.0-dev \
@@ -79,6 +81,8 @@ RUN apt-get update \
 # focal installs libtinfo6 instead.
  libtinfo5 \
  libtool \
+# For building lldb.
+ libxml2-dev \
  llvm \
  locales \
  lzop \
@@ -292,4 +296,4 @@ VOLUME /tmp
 EXPOSE 22
 CMD ["/usr/sbin/sshd", "-D"]
 # This is a dummy comment to trigger a base image rebuild.
-# checksum: a2c593d2ba63f26d1ded9da6d2b9b965
+# checksum: 7d2abad6c5bf6987d3dd985a467ded48
diff --git a/jammy-arm64-tcwg-base/jammy-arm64-tcwg-llvmbot/Dockerfile b/jammy-arm64-tcwg-base/jammy-arm64-tcwg-llvmbot/Dockerfile
index 1bfef736..9c22d400 100644
--- a/jammy-arm64-tcwg-base/jammy-arm64-tcwg-llvmbot/Dockerfile
+++ b/jammy-arm64-tcwg-base/jammy-arm64-tcwg-llvmbot/Dockerfile
@@ -16,7 +16,6 @@ RUN apt-get update \
  language-pack-ja \
  language-pack-ru \
  language-pack-zh-hans \
- libedit-dev \
  libjson-perl \
  libtinfo-dev \
 # We build clang+llvm releases on Ubuntu Bionic, which has libtinfo.so.5,
@@ -27,7 +26,6 @@ RUN apt-get update \
 # We should no longer need libtinfo5 when we switch building releases to
 # Ubuntu Focal or later.
  libtinfo5 \
- libxml2-dev \
  linux-tools-common \
  python3-buildbot-worker \
  tmux \
@@ -84,4 +82,4 @@ COPY run.sh .
 COPY start.sh .
 ENTRYPOINT ["/run.sh"]
 CMD ["start.sh"]
-# checksum: 878e6ac4df66da54d30ddd2178776048
+# checksum: bf0f12e46f0f08b3caeee1cebc815d2e
diff --git a/jammy-armhf-tcwg-base/Dockerfile b/jammy-armhf-tcwg-base/Dockerfile
index 4ffa01e9..f24623ae 100644
--- a/jammy-armhf-tcwg-base/Dockerfile
+++ b/jammy-armhf-tcwg-base/Dockerfile
@@ -58,6 +58,8 @@ RUN apt-get update \
 # libc6-dbg is necessary for armhf debugging, but also helps on aarch64.
  libc6-dbg \
  libcc1-0 \
+# For building lldb.
+ libedit-dev \
  libexpat1-dev \
  libffi-dev \
  libglib2.0-dev \
@@ -79,6 +81,8 @@ RUN apt-get update \
 # focal installs libtinfo6 instead.
  libtinfo5 \
  libtool \
+# For building lldb.
+ libxml2-dev \
  llvm \
  locales \
  lzop \
@@ -302,4 +306,4 @@ VOLUME /tmp
 EXPOSE 22
 CMD ["linux32", "/usr/sbin/sshd", "-D"]
 # This is a dummy comment to trigger a base image rebuild.
-# checksum: f4ab59dcbd529ceef86e25dc53e9ba85
+# checksum: 0d9ce89ad1e4b5e1bf112d185107724b
diff --git a/jammy-armhf-tcwg-base/jammy-armhf-tcwg-llvmbot/Dockerfile b/jammy-armhf-tcwg-base/jammy-armhf-tcwg-llvmbot/Dockerfile
index 7c31c5c7..452e4934 100644
--- a/jammy-armhf-tcwg-base/jammy-armhf-tcwg-llvmbot/Dockerfile
+++ b/jammy-armhf-tcwg-base/jammy-armhf-tcwg-llvmbot/Dockerfile
@@ -16,7 +16,6 @@ RUN apt-get update \
  language-pack-ja \
  language-pack-ru \
  language-pack-zh-hans \
- libedit-dev \
  libjson-perl \
  libtinfo-dev \
 # We build clang+llvm releases on Ubuntu Bionic, which has libtinfo.so.5,
@@ -27,7 +26,6 @@ RUN apt-get update \
 # We should no longer need libtinfo5 when we switch building releases to
 # Ubuntu Focal or later.
  libtinfo5 \
- libxml2-dev \
  linux-tools-common \
  python3-buildbot-worker \
  tmux \
@@ -72,4 +70,4 @@ COPY run.sh .
 COPY start.sh .
 ENTRYPOINT ["linux32", "/run.sh"]
 CMD ["start.sh"]
-# checksum: f10542b66389926b2ee48fcf3853c110
+# checksum: 14a7d240dbcb9dca43f398321a3da6f5
diff --git a/tcwg-base/Dockerfile.in b/tcwg-base/Dockerfile.in
index 567a3729..9eafcb1a 100644
--- a/tcwg-base/Dockerfile.in
+++ b/tcwg-base/Dockerfile.in
@@ -65,6 +65,8 @@ RUN apt-get update \
 # libc6-dbg is necessary for armhf debugging, but also helps on aarch64.
  libc6-dbg \
  libcc1-0 \
+# For building lldb.
+ libedit-dev \
  libexpat1-dev \
  libffi-dev \
  libglib2.0-dev \
@@ -86,6 +88,8 @@ RUN apt-get update \
 # focal installs libtinfo6 instead.
  libtinfo5 \
  libtool \
+# For building lldb.
+ libxml2-dev \
  llvm \
  locales \
  lzop \
diff --git a/tcwg-base/tcwg-llvmbot/Dockerfile.in b/tcwg-base/tcwg-llvmbot/Dockerfile.in
index bdf1eb1f..2b5081a1 100644
--- a/tcwg-base/tcwg-llvmbot/Dockerfile.in
+++ b/tcwg-base/tcwg-llvmbot/Dockerfile.in
@@ -17,7 +17,6 @@ RUN apt-get update \
  language-pack-ja \
  language-pack-ru \
  language-pack-zh-hans \
- libedit-dev \
  libjson-perl \
  libtinfo-dev \
 # We build clang+llvm releases on Ubuntu Bionic, which has libtinfo.so.5,
@@ -28,7 +27,6 @@ RUN apt-get update \
 # We should no longer need libtinfo5 when we switch building releases to
 # Ubuntu Focal or later.
  libtinfo5 \
- libxml2-dev \
  linux-tools-common \
  python3-buildbot-worker \
  tmux \