From e56bd19d796e627ae00d04309c2f805e08496095 Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Fri, 29 Dec 2023 16:34:51 +0200 Subject: [PATCH 1/6] Update Ubuntu 22.04 crossdeps to install llvm 17 --- src/ubuntu/22.04/crossdeps/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ubuntu/22.04/crossdeps/Dockerfile b/src/ubuntu/22.04/crossdeps/Dockerfile index 7ca3f6e58..a2128f448 100644 --- a/src/ubuntu/22.04/crossdeps/Dockerfile +++ b/src/ubuntu/22.04/crossdeps/Dockerfile @@ -38,8 +38,8 @@ RUN apt-get update \ libzstd-dev \ && rm -rf /var/lib/apt/lists/* -# install llvm-toolchain v15 using official script -RUN wget -O- https://apt.llvm.org/llvm.sh | bash -s -- 15 \ +# install llvm-toolchain v17 using official script +RUN wget -O- https://apt.llvm.org/llvm.sh | bash -s -- 17 \ clang \ clang-tools \ liblldb-dev \ From b33ca4bf4afafa5f9a10be4970adffb5fc292b85 Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Fri, 29 Dec 2023 17:20:44 +0200 Subject: [PATCH 2/6] . --- src/ubuntu/22.04/crossdeps/Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/ubuntu/22.04/crossdeps/Dockerfile b/src/ubuntu/22.04/crossdeps/Dockerfile index a2128f448..e85269811 100644 --- a/src/ubuntu/22.04/crossdeps/Dockerfile +++ b/src/ubuntu/22.04/crossdeps/Dockerfile @@ -50,6 +50,5 @@ RUN wget -O- https://apt.llvm.org/llvm.sh | bash -s -- 17 \ && rm -rf /var/lib/apt/lists/* # Install debian ports package signing keys -RUN wget https://www.ports.debian.org/archive_2024.key && \ - echo "5dba676e1c2b14882a39a93d002f77a11464d3c0ddce503a7601202a34fd5d48f1fead96fd8f975cfed00f525444b02aaf0c1c222a44c8759cbb04e55408f6d3 archive_2024.key" | sha512sum -c && \ - gpg --output /usr/share/keyrings/debian-ports-archive-keyring.gpg --dearmor archive_2024.key +RUN apt-get update \ + && apt-get install -y debian-archive-keyring From 9cdbb50490bf714393d6c059d3a71bc06f13447a Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Fri, 29 Dec 2023 18:02:51 +0200 Subject: [PATCH 3/6] . --- src/ubuntu/build-scripts/run-arcade-build-rootfs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ubuntu/build-scripts/run-arcade-build-rootfs.sh b/src/ubuntu/build-scripts/run-arcade-build-rootfs.sh index 44d02e759..e23446c4d 100755 --- a/src/ubuntu/build-scripts/run-arcade-build-rootfs.sh +++ b/src/ubuntu/build-scripts/run-arcade-build-rootfs.sh @@ -44,7 +44,7 @@ fi echo "Using $dockerCrossDepsTag to clone arcade to fetch scripts used to build cross-toolset" docker exec $buildRootFSContainer sh -c ' git config --global user.email builder@dotnet-buildtools-prereqs-docker && - git clone --depth 1 --single-branch https://github.com/dotnet/arcade /scripts' + git clone --depth 1 --single-branch https://github.com/dkurt/arcade -b dkurt/update_riscv64_rootfs /scripts' if [ $? -ne 0 ]; then echo "Rootfs build failed: `git clone https://github.com/dotnet/arcade /scripts` returned error" From 1167f5574a0fa60db71d490475446dc938e70c74 Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Fri, 29 Dec 2023 19:37:14 +0200 Subject: [PATCH 4/6] dedup apt-update --- src/ubuntu/22.04/crossdeps/Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/ubuntu/22.04/crossdeps/Dockerfile b/src/ubuntu/22.04/crossdeps/Dockerfile index e85269811..07d41dcbe 100644 --- a/src/ubuntu/22.04/crossdeps/Dockerfile +++ b/src/ubuntu/22.04/crossdeps/Dockerfile @@ -20,6 +20,7 @@ RUN apt-get update \ cmake \ cpio \ debootstrap \ + debian-archive-keyring \ flex \ gdb \ make \ @@ -48,7 +49,3 @@ RUN wget -O- https://apt.llvm.org/llvm.sh | bash -s -- 17 \ llvm \ python3-lldb \ && rm -rf /var/lib/apt/lists/* - -# Install debian ports package signing keys -RUN apt-get update \ - && apt-get install -y debian-archive-keyring From c6044ca7fc4085369dda8743cefd13142c496681 Mon Sep 17 00:00:00 2001 From: Adeel Mujahid <3840695+am11@users.noreply.github.com> Date: Fri, 29 Dec 2023 21:06:12 +0200 Subject: [PATCH 5/6] sort sublist --- src/ubuntu/22.04/crossdeps/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ubuntu/22.04/crossdeps/Dockerfile b/src/ubuntu/22.04/crossdeps/Dockerfile index 07d41dcbe..7b7039183 100644 --- a/src/ubuntu/22.04/crossdeps/Dockerfile +++ b/src/ubuntu/22.04/crossdeps/Dockerfile @@ -19,8 +19,8 @@ RUN apt-get update \ build-essential \ cmake \ cpio \ - debootstrap \ debian-archive-keyring \ + debootstrap \ flex \ gdb \ make \ From d5c82837acde9562a54d6af2bea68051af5dcc5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 8 Jan 2024 19:31:52 +0100 Subject: [PATCH 6/6] Update run-arcade-build-rootfs.sh --- src/ubuntu/build-scripts/run-arcade-build-rootfs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ubuntu/build-scripts/run-arcade-build-rootfs.sh b/src/ubuntu/build-scripts/run-arcade-build-rootfs.sh index e23446c4d..44d02e759 100755 --- a/src/ubuntu/build-scripts/run-arcade-build-rootfs.sh +++ b/src/ubuntu/build-scripts/run-arcade-build-rootfs.sh @@ -44,7 +44,7 @@ fi echo "Using $dockerCrossDepsTag to clone arcade to fetch scripts used to build cross-toolset" docker exec $buildRootFSContainer sh -c ' git config --global user.email builder@dotnet-buildtools-prereqs-docker && - git clone --depth 1 --single-branch https://github.com/dkurt/arcade -b dkurt/update_riscv64_rootfs /scripts' + git clone --depth 1 --single-branch https://github.com/dotnet/arcade /scripts' if [ $? -ne 0 ]; then echo "Rootfs build failed: `git clone https://github.com/dotnet/arcade /scripts` returned error"