From a10b73bf372c9523d14dc08ff09808e6f6f2042b Mon Sep 17 00:00:00 2001 From: Ansen Huang Date: Tue, 5 May 2026 13:33:37 -0700 Subject: [PATCH] Containers: Revert Ubuntu-22 multilib and Perl XML additions These packages were added in #572 but are not needed for Ubuntu-22. No known consumer uses Ubuntu-22 for IA32 cross-compilation, and the multilib packages conflict with gcc-12-x86-64-linux-gnux32 causing apt to fail with exit code 100. This reverts the Ubuntu-22 portion of commit 9ac4099. --- .sync/containers/Ubuntu-22/Dockerfile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.sync/containers/Ubuntu-22/Dockerfile b/.sync/containers/Ubuntu-22/Dockerfile index 572e5581..a4871c05 100644 --- a/.sync/containers/Ubuntu-22/Dockerfile +++ b/.sync/containers/Ubuntu-22/Dockerfile @@ -55,8 +55,6 @@ RUN apt-get update && \ gnupg2 \ lcov \ libssl-dev \ - libxml-parser-perl \ - libxml-simple-perl \ lld \ llvm \ jq \ @@ -79,8 +77,6 @@ RUN apt-get update && \ {% endraw %}python{{ sync_version.python_version }}{% raw %} \ {% endraw %}python{{ sync_version.python_version }}{% raw %}-venv \ g++-${GCC_MAJOR_VERSION} gcc-${GCC_MAJOR_VERSION} \ - g++-${GCC_MAJOR_VERSION}-multilib \ - gcc-${GCC_MAJOR_VERSION}-multilib \ gcc-${GCC_MAJOR_VERSION}-x86-64-linux-gnux32 \ gcc-${GCC_MAJOR_VERSION}-aarch64-linux-gnu \ gcc-${GCC_MAJOR_VERSION}-riscv64-linux-gnu \