From 3c4eacdae9c7c95460673d3e9d0896144c4f2472 Mon Sep 17 00:00:00 2001
From: Adeel Mujahid <3840695+am11@users.noreply.github.com>
Date: Tue, 30 Jul 2024 15:41:01 +0300
Subject: [PATCH] Remove gpg workaround from riscv (#1151)

---
 src/azurelinux/3.0/net9.0/cross/riscv64/Dockerfile  |  3 +--
 .../3.0/net9.0/crossdeps-builder/amd64/Dockerfile   | 13 +++++++------
 src/ubuntu/22.04/cross/illumos/Dockerfile           |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/azurelinux/3.0/net9.0/cross/riscv64/Dockerfile b/src/azurelinux/3.0/net9.0/cross/riscv64/Dockerfile
index 019c33f2b..362dbae22 100644
--- a/src/azurelinux/3.0/net9.0/cross/riscv64/Dockerfile
+++ b/src/azurelinux/3.0/net9.0/cross/riscv64/Dockerfile
@@ -11,8 +11,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..3506c71fd 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,20 @@ 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 && \
+    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-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 && \
diff --git a/src/ubuntu/22.04/cross/illumos/Dockerfile b/src/ubuntu/22.04/cross/illumos/Dockerfile
index d0ec1c19c..165b09225 100644
--- a/src/ubuntu/22.04/cross/illumos/Dockerfile
+++ b/src/ubuntu/22.04/cross/illumos/Dockerfile
@@ -1,6 +1,6 @@
 ARG ROOTFS_DIR=/crossrootfs/x64
 
-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