import dotnet7.0-7.0.100-0.2.rc1.el8

2022-09-20 14:12:06 +00:00 · 2022-09-20 14:12:06 +00:00 · 9e6c8273c0
commit 9e6c8273c0
parent c0dcb96ac6
5 changed files with 83 additions and 20 deletions
--- 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
--- 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
--- a/SOURCES/razor-compiler-apphost.patch
+++ 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 @@
+     <!-- No need to track public APIs of this tool. -->
+     <AddPublicApiAnalyzers>false</AddPublicApiAnalyzers>
+     <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
+    <UseAppHost>false</UseAppHost>
+   </PropertyGroup>
+ 
+ </Project>
+--- 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 @@
+     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+     <ExcludeFromSourceBuild>true</ExcludeFromSourceBuild>
+     <IsPackable>false</IsPackable>
+    <UseAppHost>false</UseAppHost>
+   </PropertyGroup>
+ 
+   <ItemGroup>
--- a/SOURCES/runtime-74147-no-pgo-with-mono.patch
+++ 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 <directhex@apebox.org>
+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 @@
+     <DefaultMonoSubsets Condition="'$(MonoAOTEnableLLVM)' == 'true' and '$(MonoAOTLLVMDir)' == ''">mono.llvm+</DefaultMonoSubsets>
+     <DefaultMonoSubsets Condition="'$(TargetOS)' == 'Browser'">$(DefaultMonoSubsets)mono.wasmruntime+</DefaultMonoSubsets>
+     <DefaultMonoSubsets Condition="'$(MonoCrossAOTTargetOS)' != ''">$(DefaultMonoSubsets)mono.aotcross+</DefaultMonoSubsets>
+-    <DefaultMonoSubsets>$(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages+mono.tools+</DefaultMonoSubsets>
+    <DefaultMonoSubsets>$(DefaultMonoSubsets)mono.runtime+mono.corelib+mono.packages+</DefaultMonoSubsets>
+    <DefaultMonoSubsets Condition="'$(PrimaryRuntimeFlavor)' != 'Mono'">$(DefaultMonoSubsets)mono.tools+</DefaultMonoSubsets>
+     <DefaultMonoSubsets Condition="'$(TargetsMobile)' != 'true'">$(DefaultMonoSubsets)host.native+</DefaultMonoSubsets>
+ 
+     <DefaultLibrariesSubsets Condition="'$(BuildTargetFramework)' == '$(NetCoreAppCurrent)' or
+-- 
+2.37.2
--- a/SPECS/dotnet7.0.spec
+++ b/SPECS/dotnet7.0.spec
@ -6,12 +6,12 @@
 # until that's done, disable LTO.  This has to happen before setting the flags below.
 %define _lto_cflags %{nil}

-%global host_version 7.0.0-rc.1.22411.12
-%global runtime_version 7.0.0-rc.1.22411.12
-%global aspnetcore_runtime_version 7.0.0-rc.1.22412.2
-%global sdk_version 7.0.100-rc.1.22413.1
+%global host_version 7.0.0-rc.1.22426.10
+%global runtime_version 7.0.0-rc.1.22426.10
+%global aspnetcore_runtime_version 7.0.0-rc.1.22427.2
+%global sdk_version 7.0.100-rc.1.22464.1
 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|')
-%global templates_version 7.0.0-rc.1.22412.2
+%global templates_version 7.0.0-rc.1.22427.2
 #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')

 %global host_rpm_version 7.0.0
@ -21,7 +21,7 @@

 # upstream can update releases without revving the SDK version so these don't always match
 #%%global upstream_tag v%%{sdk_version}
-%global upstream_tag fd587269d0a1fa669d547f3a2e74f5d9353b6dcf
+%global upstream_tag v7.0.100-rc.1.22431.12

 %if 0%{?fedora} || 0%{?rhel} < 8
 %global use_bundled_libunwind 0
@ -47,7 +47,7 @@

 Name:           dotnet7.0
 Version:        %{sdk_rpm_version}
-Release:        0.1%{?dist}
+Release:        0.2.rc1%{?dist}
 Summary:        .NET Runtime and SDK
 License:        MIT and ASL 2.0 and BSD and LGPLv2+ and CC-BY and CC0 and MS-PL and EPL-1.0 and GPL+ and GPLv2 and ISC and OFL and zlib
 URL:            https://github.com/dotnet/
@ -57,9 +57,9 @@ URL:            https://github.com/dotnet/
 # ./build-dotnet-tarball --bootstrap %%{upstream_tag}
 Source0:        dotnet-%{upstream_tag}-x64-bootstrap.tar.xz
 # Generated via ./build-arm64-bootstrap-tarball
-Source1:        dotnet-arm64-prebuilts-2022-08-17.tar.gz
+Source1:        dotnet-arm64-prebuilts-2022-09-17.tar.gz
 # Generated manually, same pattern as the arm64 tarball
-Source2:        dotnet-s390x-prebuilts-2021-10-29.tar.gz
+Source2:        dotnet-s390x-prebuilts-2022-08-24.tar.gz
 %else
 # The source is generated on a Fedora box via:
 # ./build-dotnet-tarball %%{upstream_tag}
@ -69,11 +69,13 @@ Source0:        dotnet-%{upstream_tag}.tar.gz
 Source10:       check-debug-symbols.py
 Source11:       dotnet.sh.in

+Patch1:         razor-compiler-apphost.patch
+# https://github.com/dotnet/runtime/pull/74147
+Patch2:         runtime-74147-no-pgo-with-mono.patch
+

 %if 0%{?fedora} || 0%{?rhel} >= 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 <omajid@redhat.com> - 7.0.100
+* Sat Sep 17 2022 Omair Majid <omajid@redhat.com> - 7.0.100-0.2.rc1
+- Update to .NET 7 RC 1
+- Enable s390x builds
+- Resolves: RHBZ#2123886
+
+* Thu Aug 25 2022 Omair Majid <omajid@redhat.com> - 7.0.100-0.1
 - Initial .NET 7 package
 - Resolves: RHBZ#2112096