From 438ec262d8cea316e89564e01b1672abd6c49c63 Mon Sep 17 00:00:00 2001 From: Ian Leonard Date: Thu, 11 Jul 2024 19:29:28 -0400 Subject: [PATCH 1/4] dockerfiles: update packages for aarch64 to amd64 crosscompiles Signed-off-by: Ian Leonard --- tools/docker/jammy/Dockerfile | 8 +------- tools/docker/noble/Dockerfile | 8 +------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/tools/docker/jammy/Dockerfile b/tools/docker/jammy/Dockerfile index 66e26c3fe3..c579e44511 100644 --- a/tools/docker/jammy/Dockerfile +++ b/tools/docker/jammy/Dockerfile @@ -29,13 +29,7 @@ RUN apt-get install -y \ && ln -s /usr/lib/go-1.22/bin/gofmt /usr/bin/gofmt RUN if [ "$(uname -m)" = "aarch64" ]; then \ - echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse' > /etc/apt/sources.list.d/amd64.list; \ - echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \ - echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-security main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \ - echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy-backports main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \ - apt-get update; \ - dpkg --add-architecture amd64; \ - apt-get install -y libc6:amd64 qemu-user-binfmt --no-install-recommends; \ + apt-get install -y libc6-amd64-cross qemu-user-binfmt --no-install-recommends; \ fi RUN rm -rf /var/lib/apt/lists/* diff --git a/tools/docker/noble/Dockerfile b/tools/docker/noble/Dockerfile index 6c32d4a9d2..8dc2026257 100644 --- a/tools/docker/noble/Dockerfile +++ b/tools/docker/noble/Dockerfile @@ -28,13 +28,7 @@ RUN apt-get install -y \ && ln -s /usr/lib/go-1.23/bin/gofmt /usr/bin/gofmt RUN if [ "$(uname -m)" = "aarch64" ]; then \ - echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble main restricted universe multiverse' > /etc/apt/sources.list.d/amd64.list; \ - echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble-updates main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \ - echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble-security main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \ - echo 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ noble-backports main restricted universe multiverse' >> /etc/apt/sources.list.d/amd64.list; \ - apt-get update; \ - dpkg --add-architecture amd64; \ - apt-get install -y libc6:amd64 qemu-user-binfmt --no-install-recommends; \ + apt-get install -y libc6-amd64-cross qemu-user-binfmt --no-install-recommends; \ fi RUN rm -rf /var/lib/apt/lists/* From 068c3e58275d5dcc5f3dcdbaf0404e2f4b12e96d Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Wed, 12 Jun 2024 14:04:41 +0000 Subject: [PATCH 2/4] tools/docker/noble: update to gcc-14 --- tools/docker/noble/Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/docker/noble/Dockerfile b/tools/docker/noble/Dockerfile index 8dc2026257..de14f2d620 100644 --- a/tools/docker/noble/Dockerfile +++ b/tools/docker/noble/Dockerfile @@ -18,8 +18,8 @@ RUN useradd docker -U -G sudo -m -s /bin/bash \ RUN apt-get update RUN apt-get install -y \ - wget bash bc gcc-13 cpp-13 sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \ - unzip diffutils lzop make file g++-13 xfonts-utils xsltproc default-jre-headless python3 \ + wget bash bc gcc-14 cpp-14 sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \ + unzip diffutils lzop make file g++-14 xfonts-utils xsltproc default-jre-headless python3 \ libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl rdfind \ golang-1.23-go git openssh-client rsync \ --no-install-recommends \ @@ -33,10 +33,10 @@ RUN if [ "$(uname -m)" = "aarch64" ]; then \ RUN rm -rf /var/lib/apt/lists/* -RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-13 100 \ - --slave /usr/bin/cpp cpp /usr/bin/cpp-13 \ - --slave /usr/bin/g++ g++ /usr/bin/g++-13 \ - --slave /usr/bin/gcov gcov /usr/bin/gcov-13 +RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-14 100 \ + --slave /usr/bin/cpp cpp /usr/bin/cpp-14 \ + --slave /usr/bin/g++ g++ /usr/bin/g++-14 \ + --slave /usr/bin/gcov gcov /usr/bin/gcov-14 RUN update-alternatives --config gcc USER docker From 84ee6b25885749e25519eb06e2a77c19902da227 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 11 May 2025 23:44:50 +0000 Subject: [PATCH 3/4] tools/docker/noble/Dockerfile: add upx-ucl to allow binary compression of mesa:host tools --- tools/docker/noble/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/docker/noble/Dockerfile b/tools/docker/noble/Dockerfile index de14f2d620..c440166b11 100644 --- a/tools/docker/noble/Dockerfile +++ b/tools/docker/noble/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get install -y \ wget bash bc gcc-14 cpp-14 sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \ unzip diffutils lzop make file g++-14 xfonts-utils xsltproc default-jre-headless python3 \ libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl rdfind \ - golang-1.23-go git openssh-client rsync \ + golang-1.23-go git openssh-client rsync upx-ucl \ --no-install-recommends \ && ln -s /usr/lib/go-1.23 /usr/lib/go \ && ln -s /usr/lib/go-1.23/bin/go /usr/bin/go \ From 7f837287d77f79ff0edd676dbe05e2478ebb125d Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Thu, 24 Jul 2025 12:37:18 +0000 Subject: [PATCH 4/4] tools/docker/jammy/Dockerfile: add upx-ucl to allow binary compression of mesa:host tools --- tools/docker/jammy/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/docker/jammy/Dockerfile b/tools/docker/jammy/Dockerfile index c579e44511..b4aba99a6a 100644 --- a/tools/docker/jammy/Dockerfile +++ b/tools/docker/jammy/Dockerfile @@ -22,7 +22,7 @@ RUN apt-get install -y \ wget bash bc gcc-12 sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \ unzip diffutils lzop make file g++-12 xfonts-utils xsltproc default-jre-headless python3 \ libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl rdfind \ - golang-1.22-go git openssh-client rsync \ + golang-1.22-go git openssh-client rsync upx-ucl \ --no-install-recommends \ && ln -s /usr/lib/go-1.22 /usr/lib/go \ && ln -s /usr/lib/go-1.22/bin/go /usr/bin/go \