Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove gpg workaround from riscv #1151

Merged
merged 8 commits into from
Jul 30, 2024
Merged

Remove gpg workaround from riscv #1151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0f249e7
Remove gpg workaround from riscv
am11 Jul 25, 2024
d4c5cc2
Trigger illumos rebuild
am11 Jul 25, 2024
a9ee1ec
.
am11 Jul 26, 2024
8f72259
.
am11 Jul 26, 2024
577c0e3
Update Dockerfile
am11 Jul 26, 2024
29f241d
Undo dummy change
am11 Jul 26, 2024
561d031
Update src/ubuntu/22.04/cross/illumos/Dockerfile
am11 Jul 29, 2024
a526cb6
Merge branch 'main' into patch-6
am11 Jul 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/azurelinux/3.0/net9.0/cross/riscv64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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+") && \
Expand Down
13 changes: 7 additions & 6 deletions src/azurelinux/3.0/net9.0/crossdeps-builder/amd64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand Down
2 changes: 1 addition & 1 deletion src/ubuntu/22.04/cross/illumos/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down