From 980a5eb04faefb46bd9fe5fed7259f2436a20cb4 Mon Sep 17 00:00:00 2001 From: "build@apk-groulx" Date: Sun, 5 Dec 2021 18:43:15 +0000 Subject: [PATCH] [main/dotnet-3.1][main/dotnet-5.0] Attempt fix of applicationinsights patch --- apk/v3.15/main/dotnet-3.1/APKBUILD | 4 ++-- apk/v3.15/main/dotnet-3.1/README.md | 2 +- ...h => applicationsinsights-dotnet_fix-net40-location.patch} | 0 apk/v3.15/main/dotnet-5.0/APKBUILD | 4 ++-- apk/v3.15/main/dotnet-5.0/README.md | 4 ++-- ...h => applicationsinsights-dotnet_fix-net40-location.patch} | 0 6 files changed, 7 insertions(+), 7 deletions(-) rename apk/v3.15/main/dotnet-3.1/{applications-insights_fix-net40-location.patch => applicationsinsights-dotnet_fix-net40-location.patch} (100%) rename apk/v3.15/main/dotnet-5.0/{applications-insights_fix-net40-location.patch => applicationsinsights-dotnet_fix-net40-location.patch} (100%) diff --git a/apk/v3.15/main/dotnet-3.1/APKBUILD b/apk/v3.15/main/dotnet-3.1/APKBUILD index 5ffa989..e51f386 100644 --- a/apk/v3.15/main/dotnet-3.1/APKBUILD +++ b/apk/v3.15/main/dotnet-3.1/APKBUILD @@ -69,7 +69,7 @@ options="!check" source=" $pkgname-$pkgver.git.zip dotnet.sh - applications-insights_fix-net40-location.patch + applicationsinsights-dotnet_fix-net40-location.patch build_coreclr-tools-path.patch build_darc-fix-alpine.patch coreclr_fix-build-on-Alpine-edge-45352.patch @@ -308,7 +308,7 @@ aspnet_targeting_pack() { sha512sums=" 9e5e2bccb4338a18996e53e80c45525b3ba332d11cd896d1ba72bd8406735281aae7b98f614212a99475621000ca3fa5daf2d639953b163196aa2884c8773f2e dotnet-3.1-3.1.20.git.zip e61b9e3e5a2305646a616d598378230c9755c5dd5363692cc363f8f4add3807563c324dd86f3a7ae9d358c82d730608e7b293935a2b6c81c0c0f62d752a0a1cf dotnet.sh -0469d571d0f7634d3794761f04e1cbff9d27d642d134a11a13560574280e5cab6f366eb8820e61a449eca99470fdea8d9f6a7d97b633059b2fe25257ed1579e6 applications-insights_fix-net40-location.patch +0469d571d0f7634d3794761f04e1cbff9d27d642d134a11a13560574280e5cab6f366eb8820e61a449eca99470fdea8d9f6a7d97b633059b2fe25257ed1579e6 applicationsinsights-dotnet_fix-net40-location.patch 2334e36d5bb24b9b834800407c6110c09262af20a4353e92ef1897855f27eab117270dda0637071010a7a5ac8c4a5d4032240a7b659d8576801b503b66b14ab7 build_coreclr-tools-path.patch 74767c34f15e0eaee3682516e093296621efaeeb6d84e62d826587db9b559fb7c00c42aafbf4fdfd34460d1cf16edad3fd5f720f2b37f8bf52b26d7f73f79d5e build_darc-fix-alpine.patch b3475c0b727c5258c7bc6f4c53305f9ced991e57f9f46a2ad323bed40627662eb8bf57286bf6a22d9a22bfdea9282da4630dd094166f0805c783aece5df5dff3 coreclr_fix-build-on-Alpine-edge-45352.patch diff --git a/apk/v3.15/main/dotnet-3.1/README.md b/apk/v3.15/main/dotnet-3.1/README.md index 57401db..5b5345e 100644 --- a/apk/v3.15/main/dotnet-3.1/README.md +++ b/apk/v3.15/main/dotnet-3.1/README.md @@ -21,7 +21,7 @@ a way to adjust this, but for now this will do. # Patch notes -## applications-insights_fix-net40-location.patch +## applicationsinsights-dotnet_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-3.1/applications-insights_fix-net40-location.patch b/apk/v3.15/main/dotnet-3.1/applicationsinsights-dotnet_fix-net40-location.patch similarity index 100% rename from apk/v3.15/main/dotnet-3.1/applications-insights_fix-net40-location.patch rename to apk/v3.15/main/dotnet-3.1/applicationsinsights-dotnet_fix-net40-location.patch diff --git a/apk/v3.15/main/dotnet-5.0/APKBUILD b/apk/v3.15/main/dotnet-5.0/APKBUILD index efd3949..fe68201 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 - applications-insights_fix-net40-location.patch + applicationsinsights-dotnet_fix-net40-location.patch build_darc-fix-alpine.patch runtime_add-rid-for-alpine-315.patch runtime_link-order.patch @@ -300,7 +300,7 @@ sha512sums=" 7899483157a32012137e4ee44b03173908f6325085b7ee352ee329a208a0d1e5b434d1f24099e5b346ec9753e23c6a94553e76dc76a1ea6633392758132ed492 dotnet-5.0-v5.0.12.1-runtime.git.zip f58bd83b709dcb4b0b67830756069c34258a167b33cb290cbf30f21d69d75402d38e013fd7bbf00640fe19e397f78df6ff787cf8484ee8967d5b8809f033eafb dotnet.sh ecab4809e617e9cd30940b1c1a700e16b37b5974c850a60da7f1a25bf81516850e4533ef39d2d8786381e0e4e325d3b53fbb2377ecaa6c0813bb00fc1c92b784 dotnet-install.sh -0469d571d0f7634d3794761f04e1cbff9d27d642d134a11a13560574280e5cab6f366eb8820e61a449eca99470fdea8d9f6a7d97b633059b2fe25257ed1579e6 applications-insights_fix-net40-location.patch +0469d571d0f7634d3794761f04e1cbff9d27d642d134a11a13560574280e5cab6f366eb8820e61a449eca99470fdea8d9f6a7d97b633059b2fe25257ed1579e6 applicationsinsights-dotnet_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 776f3ff..4d63a3e 100644 --- a/apk/v3.15/main/dotnet-5.0/README.md +++ b/apk/v3.15/main/dotnet-5.0/README.md @@ -21,9 +21,9 @@ a way to adjust this, but for now this will do. # Patch notes -## applications-insights_fix-net40-location.patch +## applicationsinsights-dotnet_fix-net40-location.patch Because paths on Linux are case sensitive. Applications insights looks - for /src/Core/Managed/net40 in net40 + for /src/Core/Managed/net40 in net40 while the repo has a Net40. Patch moves whatever is in Net40 to net40 ## build_darc-fix-alpine.patch Darc has a segmentation fault on Alpine due to not chosing the correct diff --git a/apk/v3.15/main/dotnet-5.0/applications-insights_fix-net40-location.patch b/apk/v3.15/main/dotnet-5.0/applicationsinsights-dotnet_fix-net40-location.patch similarity index 100% rename from apk/v3.15/main/dotnet-5.0/applications-insights_fix-net40-location.patch rename to apk/v3.15/main/dotnet-5.0/applicationsinsights-dotnet_fix-net40-location.patch