From e2d5c44ee38e44c9725404f34b12f9af2c7885f8 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 20 2022 14:12:06 +0000 Subject: import dotnet7.0-7.0.100-0.2.rc1.el8 --- diff --git a/.dotnet7.0.metadata b/.dotnet7.0.metadata index e7d148c..045cd90 100644 --- a/.dotnet7.0.metadata +++ b/.dotnet7.0.metadata @@ -1,3 +1,3 @@ -2eb3691e273742e1c98ddd1fb9fdce6253414a4b SOURCES/dotnet-arm64-prebuilts-2022-08-17.tar.gz -636d7b9399eddeea347e0785b4e9fcb99a65df29 SOURCES/dotnet-fd587269d0a1fa669d547f3a2e74f5d9353b6dcf-x64-bootstrap.tar.xz -da39a3ee5e6b4b0d3255bfef95601890afd80709 SOURCES/dotnet-s390x-prebuilts-2021-10-29.tar.gz +321f8a318f904150c1ccba86ce31318ce0fe956e SOURCES/dotnet-arm64-prebuilts-2022-09-17.tar.gz +8fdf5b99a5fff92d942b03776dbd097932a474bb SOURCES/dotnet-s390x-prebuilts-2022-08-24.tar.gz +3fbdc2b9f9c1129b756ab29659ce52313250654d SOURCES/dotnet-v7.0.100-rc.1.22431.12-x64-bootstrap.tar.xz diff --git a/.gitignore b/.gitignore index 74b9f9c..7abacd8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/dotnet-arm64-prebuilts-2022-08-17.tar.gz -SOURCES/dotnet-fd587269d0a1fa669d547f3a2e74f5d9353b6dcf-x64-bootstrap.tar.xz -SOURCES/dotnet-s390x-prebuilts-2021-10-29.tar.gz +SOURCES/dotnet-arm64-prebuilts-2022-09-17.tar.gz +SOURCES/dotnet-s390x-prebuilts-2022-08-24.tar.gz +SOURCES/dotnet-v7.0.100-rc.1.22431.12-x64-bootstrap.tar.xz diff --git a/SOURCES/razor-compiler-apphost.patch b/SOURCES/razor-compiler-apphost.patch new file mode 100644 index 0000000..83f6c7f --- /dev/null +++ b/SOURCES/razor-compiler-apphost.patch @@ -0,0 +1,26 @@ +Don't use an apphost for RazorSyntaxGenerator + +The RazorSyntaxGenerator tool is excluded from source-build, but the build +system tries to find the apphost matching the TFM anyway. This project targets +netcoreapp3.1, so the build fails on s390x because the no apphost exists for +that on s390x. +--- a/src/razor-compiler/src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj ++++ a/src/razor-compiler/src/tools/RazorSyntaxGenerator/RazorSyntaxGenerator.csproj +@@ -10,6 +10,7 @@ + + false + true ++ false + + + +--- a/src/razor-compiler/src/perf/Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.csproj ++++ a/src/razor-compiler/src/perf/Microbenchmarks/Microsoft.AspNetCore.Razor.Microbenchmarks.csproj +@@ -7,6 +7,7 @@ + true + true + false ++ false + + + diff --git a/SOURCES/runtime-74147-no-pgo-with-mono.patch b/SOURCES/runtime-74147-no-pgo-with-mono.patch new file mode 100644 index 0000000..bca892b --- /dev/null +++ b/SOURCES/runtime-74147-no-pgo-with-mono.patch @@ -0,0 +1,27 @@ +From 98c1b3a803cb01232ee40bb4192679fcab3232e7 Mon Sep 17 00:00:00 2001 +From: Jo Shields +Date: Thu, 18 Aug 2022 09:08:36 -0400 +Subject: [PATCH] Don't try to build PGO tools on platforms with no CoreCLR + port. + +Closes: #74102 +--- + eng/Subsets.props | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/runtime/eng/Subsets.props b/src/runtime/eng/Subsets.props +index 911c24dbde6..1e8e5801e57 100644 +--- a/src/runtime/eng/Subsets.props ++++ b/src/runtime/eng/Subsets.props +@@ -62,7 +62,8 @@ + mono.llvm+ + $(DefaultMonoSubsets)mono.wasmruntime+ + $(DefaultMonoSubsets)mono.aotcross+ +- $(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages+mono.tools+ ++ $(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages+ ++ $(DefaultMonoSubsets)mono.tools+ + $(DefaultMonoSubsets)host.native+ + + = 8 -# FIXME -# ExclusiveArch: aarch64 x86_64 s390x -ExclusiveArch: aarch64 x86_64 +ExclusiveArch: aarch64 x86_64 s390x %else ExclusiveArch: x86_64 %endif @@ -364,6 +366,9 @@ rm -rf .dotnet/ rm -rf packages/source-built %endif +%patch1 -p1 +%patch2 -p1 + # Fix bad hardcoded path in build sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/hostmisc/pal.unix.cpp @@ -576,8 +581,8 @@ export COMPlus_LTTng=0 %dir %{_libdir}/dotnet/sdk %{_libdir}/dotnet/sdk/%{sdk_version} %dir %{_libdir}/dotnet/sdk-manifests -%{_libdir}/dotnet/sdk-manifests/6.0.300 %{_libdir}/dotnet/sdk-manifests/%{sdk_feature_band_version} +%{_libdir}/dotnet/sdk-manifests/%{sdk_feature_band_version}-rc.1 %{_libdir}/dotnet/metadata %dir %{_libdir}/dotnet/packs @@ -587,7 +592,12 @@ export COMPlus_LTTng=0 %changelog -* Thu Aug 25 2022 Omair Majid - 7.0.100 +* Sat Sep 17 2022 Omair Majid - 7.0.100-0.2.rc1 +- Update to .NET 7 RC 1 +- Enable s390x builds +- Resolves: RHBZ#2123886 + +* Thu Aug 25 2022 Omair Majid - 7.0.100-0.1 - Initial .NET 7 package - Resolves: RHBZ#2112096