diff --git a/apk/v3.15/main/dotnet-3.1/APKBUILD b/apk/v3.15/main/dotnet-3.1/APKBUILD index 671ffaa..5ffa989 100644 --- a/apk/v3.15/main/dotnet-3.1/APKBUILD +++ b/apk/v3.15/main/dotnet-3.1/APKBUILD @@ -70,14 +70,14 @@ source=" $pkgname-$pkgver.git.zip dotnet.sh applications-insights_fix-net40-location.patch + build_coreclr-tools-path.patch + build_darc-fix-alpine.patch coreclr_fix-build-on-Alpine-edge-45352.patch coreclr_non-portable-distrorid-fix-alpine.patch core-setup_rid-plat-generation-on-alpine-fix.patch - installer_generate-layout-core-setup-blob-path-fix.patch corefx_fix-build-clang10.patch corefx_added-alpine-315-rid.patch - build_coreclr-tools-path.patch - build_darc-fix-alpine.patch + installer_generate-layout-core-setup-blob-path-fix.patch sdk_telemetry-optout.patch " builddir="$srcdir/$pkgname" @@ -309,13 +309,13 @@ sha512sums=" 9e5e2bccb4338a18996e53e80c45525b3ba332d11cd896d1ba72bd8406735281aae7b98f614212a99475621000ca3fa5daf2d639953b163196aa2884c8773f2e dotnet-3.1-3.1.20.git.zip e61b9e3e5a2305646a616d598378230c9755c5dd5363692cc363f8f4add3807563c324dd86f3a7ae9d358c82d730608e7b293935a2b6c81c0c0f62d752a0a1cf dotnet.sh 0469d571d0f7634d3794761f04e1cbff9d27d642d134a11a13560574280e5cab6f366eb8820e61a449eca99470fdea8d9f6a7d97b633059b2fe25257ed1579e6 applications-insights_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 6ac9bdbc47b24cafbb3386e21756c540313680fed6994791ff5a3c75b422742ecf102d7736ac79de6d7f1a0892464f83cbab181ed505e4d827dc7f113e3a4017 coreclr_non-portable-distrorid-fix-alpine.patch 720fefc20ef4985917cfd243bbef427862af9ea0156cc6c78502daf8da5f6293bba0a1a5180c88dc145921592d533a8508b30eab2f388be1be7d6d10b6ab91d0 core-setup_rid-plat-generation-on-alpine-fix.patch -e67f4f92659892aa65de7192dfbbf2cafab17e1a4ef60e4981507c7309da61b866864a18b0452e47cee2ce9253032c3f4c39e4426b7b2216ffa73236239c9669 installer_generate-layout-core-setup-blob-path-fix.patch eb107ae9765d9eebe2f2ab4cebda4d3f76d683e21d88f806bb008e29051ad196ea637d410075b7ed61f4997a22085e4c36021860b82c4c0822c23ba9ded9656a corefx_fix-build-clang10.patch 72092a7323bb91e8d011ad09cefcc3fd0e4ebfc7c258895d454cc1d015eda36c7de97b09af76a492fa689f39b9216435faace77edd0ca75d8e39a34ed6641840 corefx_added-alpine-315-rid.patch -2334e36d5bb24b9b834800407c6110c09262af20a4353e92ef1897855f27eab117270dda0637071010a7a5ac8c4a5d4032240a7b659d8576801b503b66b14ab7 build_coreclr-tools-path.patch -74767c34f15e0eaee3682516e093296621efaeeb6d84e62d826587db9b559fb7c00c42aafbf4fdfd34460d1cf16edad3fd5f720f2b37f8bf52b26d7f73f79d5e build_darc-fix-alpine.patch +e67f4f92659892aa65de7192dfbbf2cafab17e1a4ef60e4981507c7309da61b866864a18b0452e47cee2ce9253032c3f4c39e4426b7b2216ffa73236239c9669 installer_generate-layout-core-setup-blob-path-fix.patch c96700138ea919c169c3a394f1bf9548c7f86b1ba42b193d6e7bb0a1e2bd6f7f202befbc61246a8720181cd40e1f7fa36a6c208eb19b03a23e21994136fb2507 sdk_telemetry-optout.patch " diff --git a/apk/v3.15/main/dotnet-3.1/README.md b/apk/v3.15/main/dotnet-3.1/README.md index 5736257..57401db 100644 --- a/apk/v3.15/main/dotnet-3.1/README.md +++ b/apk/v3.15/main/dotnet-3.1/README.md @@ -21,6 +21,20 @@ a way to adjust this, but for now this will do. # Patch notes +## applications-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. +## build_coreclr-tools-path.patch + Various steps in the build process looks for ilasm in ildasm in + $builddir/src/dotnet-3.1/Tools/source-built/coreclr-tools/x64 while they are + built to $builddir/src/dotnet-3.1/Tools/source-built/coreclr-tools. + This patches to look for ilasm and ildasm + in correct path. +## build_darc-fix-alpine.patch + Darc has a segmentation fault on Alpine due to not chosing the correct + binary architecture. This patch deletes all the wrong ones so that it + is forced to chose the correct one. See issue dotnet/source-build #1868 ## coreclr_fix-build-on-Alpine-edge-45352.patch Fixes a build error for Alpine Linux. It has since been fixed in dotnet-5.0, see issue dotnet/runtime 45352. @@ -41,20 +55,6 @@ a way to adjust this, but for now this will do. blobs/Runtime/3.1.20-alpine.3.15 while installer expects them in 3.1.20. This patches /src/redist/targets/GenerateLayout.targets to point to actual path. -## applications-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. -## build_coreclr-tools-path.patch - Various steps in the build process looks for ilasm in ildasm in - $builddir/src/dotnet-3.1/Tools/source-built/coreclr-tools/x64 while they are - built to $builddir/src/dotnet-3.1/Tools/source-built/coreclr-tools. - This patches to look for ilasm and ildasm - in correct path. -## build_darc-fix-alpine.patch - Darc has a segmentation fault on Alpine due to not chosing the correct - binary architecture. This patch deletes all the wrong ones so that it - is forced to chose the correct one. See issue dotnet/source-build #1868 ## sdk_telemetry-optout.patch Optouts of telemetry gathering