From 0f249e71d2068cf9af2cbf6b11a8bf3ca59a18c6 Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Fri, 26 Jul 2024 01:56:37 +0300 Subject: [PATCH 1/7] Remove gpg workaround from riscv --- src/azurelinux/3.0/net9.0/cross/riscv64/Dockerfile | 3 +-- .../3.0/net9.0/crossdeps-builder/amd64/Dockerfile | 12 ++++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/azurelinux/3.0/net9.0/cross/riscv64/Dockerfile b/src/azurelinux/3.0/net9.0/cross/riscv64/Dockerfile index 42011d3e1..580ffe67d 100644 --- a/src/azurelinux/3.0/net9.0/cross/riscv64/Dockerfile +++ b/src/azurelinux/3.0/net9.0/cross/riscv64/Dockerfile @@ -13,8 +13,7 @@ RUN tdnf remove -y debootstrap && \ ln -s /debootstrap/debootstrap -t /usr/local/bin && \ rm -f debootstrap.tar.gz -# workaround missing keyring file on host -RUN /scripts/eng/common/cross/build-rootfs.sh riscv64 noble --skipunmount --skipsigcheck +RUN /scripts/eng/common/cross/build-rootfs.sh riscv64 noble --skipunmount RUN TARGET_TRIPLE="riscv64-linux-gnu" && \ CLANG_MAJOR_VERSION=$(clang --version | grep -oP "(?<=version )\d+") && \ diff --git a/src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile b/src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile index ced66ff6f..da96504a3 100644 --- a/src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile +++ b/src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile @@ -35,19 +35,19 @@ COPY dimitri_john_ledkov.asc . RUN gpg --import dimitri_john_ledkov.asc && \ rm dimitri_john_ledkov.asc && \ # 2. Download the ubuntu keyrings - wget https://mirrors.edge.kernel.org/ubuntu/pool/main/u/ubuntu-keyring/ubuntu-keyring_2021.03.26.tar.gz && \ - echo "492eed5c06408c6f632577adb0796130af5d6542013ef418f47187a209e49bb1 ubuntu-keyring_2021.03.26.tar.gz" | sha256sum -c && \ - tar xf ubuntu-keyring_2021.03.26.tar.gz && \ - rm ubuntu-keyring_2021.03.26.tar.gz && \ + wget https://mirrors.edge.kernel.org/ubuntu/pool/main/u/ubuntu-keyring/ubuntu-keyring_2023.11.28.1.tar.xz && \ + echo "aecd455ae15561371d6e454f121f079f0641d5e1b579a5563a2bc363fc74aa2e ubuntu-keyring_2023.11.28.1.tar.xz" | sha256sum -c && \ + tar xf ubuntu-keyring_2023.11.28.1.tar.xz && \ + rm ubuntu-keyring_2023.11.28.1.tar.xz && \ # 3. Verify keyrings - pushd ubuntu-keyring-2021.03.26 && \ + pushd ubuntu-keyring && \ gpg --output SHA512SUMS.txt --decrypt SHA512SUMS.txt.asc && \ sha512sum -c SHA512SUMS.txt && \ # 4. Install the needed keyring and delete the rest mkdir -p /usr/share/keyrings && \ mv keyrings/ubuntu-archive-keyring.gpg /usr/share/keyrings && \ popd && \ - rm -r ubuntu-keyring-2021.03.26 + rm -r ubuntu-keyring # 1. Obtain signing keys used to sign llvm sources RUN wget https://releases.llvm.org/release-keys.asc && \ From d4c5cc2b7527a23b62ad351decb14c918cb6a1c4 Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Fri, 26 Jul 2024 01:58:40 +0300 Subject: [PATCH 2/7] Trigger illumos rebuild --- src/ubuntu/22.04/cross/illumos/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/ubuntu/22.04/cross/illumos/Dockerfile b/src/ubuntu/22.04/cross/illumos/Dockerfile index d0ec1c19c..c0ce388a0 100644 --- a/src/ubuntu/22.04/cross/illumos/Dockerfile +++ b/src/ubuntu/22.04/cross/illumos/Dockerfile @@ -1,5 +1,7 @@ ARG ROOTFS_DIR=/crossrootfs/x64 +# dummy comment to trigger the build + FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-crossdeps-local AS builder ARG ROOTFS_DIR From a9ee1ec395833c514929c8241a1cf36e2ae75191 Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Fri, 26 Jul 2024 08:57:34 +0300 Subject: [PATCH 3/7] . --- src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile b/src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile index da96504a3..661a334e4 100644 --- a/src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile +++ b/src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile @@ -45,7 +45,7 @@ RUN gpg --import dimitri_john_ledkov.asc && \ sha512sum -c SHA512SUMS.txt && \ # 4. Install the needed keyring and delete the rest mkdir -p /usr/share/keyrings && \ - mv keyrings/ubuntu-archive-keyring.gpg /usr/share/keyrings && \ + mv keyrings/ubuntu-archive*.gpg /usr/share/keyrings && \ popd && \ rm -r ubuntu-keyring From 8f722597fa98b6a267e9c5ec9e917a8ca8f7a4d0 Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Fri, 26 Jul 2024 11:40:07 +0300 Subject: [PATCH 4/7] . --- src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile b/src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile index 661a334e4..3506c71fd 100644 --- a/src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile +++ b/src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile @@ -45,7 +45,8 @@ RUN gpg --import dimitri_john_ledkov.asc && \ sha512sum -c SHA512SUMS.txt && \ # 4. Install the needed keyring and delete the rest mkdir -p /usr/share/keyrings && \ - mv keyrings/ubuntu-archive*.gpg /usr/share/keyrings && \ + mv keyrings/ubuntu-archive-keyring.gpg /usr/share/keyrings && \ + wget -qO- "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920D1991BC93C" | gpg --dearmor > /usr/share/keyrings/ubuntu-archive-removed-keys.gpg && \ popd && \ rm -r ubuntu-keyring From 577c0e3a7b71d21c67544248331b655d1f482b8e Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Fri, 26 Jul 2024 12:11:55 +0300 Subject: [PATCH 5/7] Update Dockerfile --- src/azurelinux/3.0/net9.0/cross/arm64/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/src/azurelinux/3.0/net9.0/cross/arm64/Dockerfile b/src/azurelinux/3.0/net9.0/cross/arm64/Dockerfile index 95c3039be..07acc4173 100644 --- a/src/azurelinux/3.0/net9.0/cross/arm64/Dockerfile +++ b/src/azurelinux/3.0/net9.0/cross/arm64/Dockerfile @@ -3,6 +3,7 @@ ARG ROOTFS_DIR=/crossrootfs/arm64 FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-crossdeps-builder-net9.0-local AS builder ARG ROOTFS_DIR +# dummy to make sure it doesn't regress RUN /scripts/eng/common/cross/build-rootfs.sh arm64 xenial --skipunmount RUN TARGET_TRIPLE="aarch64-linux-gnu" && \ From 29f241d3030e62fd0a122887892e171a08f61c30 Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Fri, 26 Jul 2024 15:20:30 +0300 Subject: [PATCH 6/7] Undo dummy change --- src/azurelinux/3.0/net9.0/cross/arm64/Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/src/azurelinux/3.0/net9.0/cross/arm64/Dockerfile b/src/azurelinux/3.0/net9.0/cross/arm64/Dockerfile index 07acc4173..95c3039be 100644 --- a/src/azurelinux/3.0/net9.0/cross/arm64/Dockerfile +++ b/src/azurelinux/3.0/net9.0/cross/arm64/Dockerfile @@ -3,7 +3,6 @@ ARG ROOTFS_DIR=/crossrootfs/arm64 FROM mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-crossdeps-builder-net9.0-local AS builder ARG ROOTFS_DIR -# dummy to make sure it doesn't regress RUN /scripts/eng/common/cross/build-rootfs.sh arm64 xenial --skipunmount RUN TARGET_TRIPLE="aarch64-linux-gnu" && \ From 561d0319f6838e28eb02f6b8634e8e5f90066e98 Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Mon, 29 Jul 2024 23:03:55 +0300 Subject: [PATCH 7/7] Update src/ubuntu/22.04/cross/illumos/Dockerfile --- src/ubuntu/22.04/cross/illumos/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/ubuntu/22.04/cross/illumos/Dockerfile b/src/ubuntu/22.04/cross/illumos/Dockerfile index c0ce388a0..165b09225 100644 --- a/src/ubuntu/22.04/cross/illumos/Dockerfile +++ b/src/ubuntu/22.04/cross/illumos/Dockerfile @@ -1,8 +1,6 @@ ARG ROOTFS_DIR=/crossrootfs/x64 -# dummy comment to trigger the build - -FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-crossdeps-local AS builder +FROM mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-crossdeps-local AS builder ARG ROOTFS_DIR # Obtain arcade scripts used to build rootfs