add dependency and backport commits

backport fixes dotnet/runtime#110985 dotnet/runtime#107559 add mandatory dependency in DockerFile dotnet/runtime#109681 dotnet/arcade#15233
saitama951 · Jan 2, 2025 · 5ae4511 · 5ae4511
1 parent 5e1e2e1
commit 5ae4511
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/docker/image/Dockerfile b/docker/image/Dockerfile
@@ -39,6 +39,7 @@ RUN apt-get update && \
     apt-get install --no-install-recommends --yes \
         binutils-multiarch \
         clang-$llvm_version \
+        cpio \
         gawk \
         git \
         jq \

diff --git a/dotnet-prepare b/dotnet-prepare
@@ -108,6 +108,10 @@ function prepare_runtime {
     backport 51bf70e94b0c "../runtime-patches/Fix-cmakeargs-in-coreclr-proj.patch 7d562f9d2a42 2811e7c7551c"
     # https://github.com/dotnet/runtime/pull/93875
     backport 1c80769c0d6e "dc944d57c4f4 3cd64558e864"
+    # https://github.com/dotnet/runtime/pull/107559
+    backport ab28e0a0c263 4930e1b44027
+    # https://github.com/dotnet/runtime/pull/110985
+    backport a5eced487f63 1613dd360914
 
     if [ -s ../runtime-patches/series ]; then
         rm -rf .pc
-Original file line number
+Diff line change
@@ Expand Up / @@ -39,6 +39,7 @@ RUN apt-get update && \ @@
         apt-get install --no-install-recommends --yes \
             binutils-multiarch \
             clang-$llvm_version \
+            cpio \
             gawk \
             git \
             jq \
@@ Expand Down @@