From c0f1cfc6760ffccbb4dd44d92f6f542f6f73adad Mon Sep 17 00:00:00 2001 From: "build@apk-groulx" Date: Sun, 5 Dec 2021 21:05:00 +0000 Subject: [PATCH] [main/dotnet-5.0] Fixed application-insights patch --- apk/v3.15/main/dotnet-5.0/APKBUILD | 11 +++++++---- apk/v3.15/main/dotnet-5.0/README.md | 2 +- ... => application-insights_fix-net40-location.patch} | 0 3 files changed, 8 insertions(+), 5 deletions(-) rename apk/v3.15/main/dotnet-5.0/{applicationsinsights-dotnet_fix-net40-location.patch => application-insights_fix-net40-location.patch} (100%) diff --git a/apk/v3.15/main/dotnet-5.0/APKBUILD b/apk/v3.15/main/dotnet-5.0/APKBUILD index fe68201..5af4703 100644 --- a/apk/v3.15/main/dotnet-5.0/APKBUILD +++ b/apk/v3.15/main/dotnet-5.0/APKBUILD @@ -68,7 +68,7 @@ source=" $pkgname-$_gittag.git.zip dotnet.sh https://dot.net/v1/dotnet-install.sh - applicationsinsights-dotnet_fix-net40-location.patch + application-insights_fix-net40-location.patch build_darc-fix-alpine.patch runtime_add-rid-for-alpine-315.patch runtime_link-order.patch @@ -141,10 +141,13 @@ prepare() { msg "Settings up bootstrap SDK" if [ "$_bootstrap" == 'true' ]; then chmod +x "$srcdir"/dotnet-install.sh - "$srcdir"/dotnet-install.sh --version $_bootstrap_sdk --install-dir ./ - "$srcdir"/dotnet-install.sh --version $_bootstrap_runtime --install-dir ./ --runtime dotnet + "$srcdir"/dotnet-install.sh --install-dir ./ + "$srcdir"/dotnet-install.sh --install-dir ./ --runtime dotnet else cp -r /usr/share/dotnet/* ./ + if [[ $(find sdk -type d -not -name '5.0.*' -maxdepth 1 -mindepth 1) ]]; then + find sdk -type d -not -name '5.0.*' -maxdepth 1 -mindepth 1 -print0 | xargs -0 rm -R -- + fi fi # disable warnings @@ -300,7 +303,7 @@ sha512sums=" 7899483157a32012137e4ee44b03173908f6325085b7ee352ee329a208a0d1e5b434d1f24099e5b346ec9753e23c6a94553e76dc76a1ea6633392758132ed492 dotnet-5.0-v5.0.12.1-runtime.git.zip f58bd83b709dcb4b0b67830756069c34258a167b33cb290cbf30f21d69d75402d38e013fd7bbf00640fe19e397f78df6ff787cf8484ee8967d5b8809f033eafb dotnet.sh ecab4809e617e9cd30940b1c1a700e16b37b5974c850a60da7f1a25bf81516850e4533ef39d2d8786381e0e4e325d3b53fbb2377ecaa6c0813bb00fc1c92b784 dotnet-install.sh -0469d571d0f7634d3794761f04e1cbff9d27d642d134a11a13560574280e5cab6f366eb8820e61a449eca99470fdea8d9f6a7d97b633059b2fe25257ed1579e6 applicationsinsights-dotnet_fix-net40-location.patch +0469d571d0f7634d3794761f04e1cbff9d27d642d134a11a13560574280e5cab6f366eb8820e61a449eca99470fdea8d9f6a7d97b633059b2fe25257ed1579e6 application-insights_fix-net40-location.patch 74767c34f15e0eaee3682516e093296621efaeeb6d84e62d826587db9b559fb7c00c42aafbf4fdfd34460d1cf16edad3fd5f720f2b37f8bf52b26d7f73f79d5e build_darc-fix-alpine.patch 4899175597a1d4cd14c382469fe17e6d8d4644b784dca02eb2d4f71afa8e898e60269d5b0cdfea6e3ed6dc92feb676c6db21aae3bcb206d859c02cd10cdcaca0 runtime_add-rid-for-alpine-315.patch 0d6ca9b4c6bb0999102f8a51b408c6f938d7262af552d63ef180fdc9a48bba940d0437d0d06916c3f7be7e70e2717a46a4ebc91c0f85467cbc7776b944eca83e runtime_link-order.patch diff --git a/apk/v3.15/main/dotnet-5.0/README.md b/apk/v3.15/main/dotnet-5.0/README.md index 4d63a3e..9ed5960 100644 --- a/apk/v3.15/main/dotnet-5.0/README.md +++ b/apk/v3.15/main/dotnet-5.0/README.md @@ -21,7 +21,7 @@ a way to adjust this, but for now this will do. # Patch notes -## applicationsinsights-dotnet_fix-net40-location.patch +## application-insights_fix-net40-location.patch Because paths on Linux are case sensitive. Applications insights looks for /src/Core/Managed/net40 in net40 while the repo has a Net40. Patch moves whatever is in Net40 to net40 diff --git a/apk/v3.15/main/dotnet-5.0/applicationsinsights-dotnet_fix-net40-location.patch b/apk/v3.15/main/dotnet-5.0/application-insights_fix-net40-location.patch similarity index 100% rename from apk/v3.15/main/dotnet-5.0/applicationsinsights-dotnet_fix-net40-location.patch rename to apk/v3.15/main/dotnet-5.0/application-insights_fix-net40-location.patch