Use upstream arcade-build-tarball.patch

IBM · Aug 16, 2022 · 4ba8e47 · 4ba8e47
1 parent fcdb4f4
commit 4ba8e47
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 32 deletions.
diff --git a/dotnet-s390x-prepare b/dotnet-s390x-prepare
@@ -89,9 +89,9 @@ popd
 
 pushd installer
 update_nuget_config
-rm -rf .pc
-ln -fsT ../installer-patches patches
-quilt push -a
+if ! git merge-base --is-ancestor 5501c7f23811 HEAD; then
+    git cherry-pick 5501c7f23811
+fi
 popd
 
 install_host_sdk runtime

diff --git a/installer-patches/arcade-build-tarball.patch b/installer-patches/arcade-build-tarball.patch
diff --git a/installer-patches/series b/installer-patches/series
@@ -1 +0,0 @@
-arcade-build-tarball.patch