diff --git a/dotnet5.0.spec b/dotnet5.0.spec index 6b1dc9d..5cf9541 100644 --- a/dotnet5.0.spec +++ b/dotnet5.0.spec @@ -56,7 +56,7 @@ Name: dotnet5.0 Version: %{sdk_rpm_version} -Release: 1%{?dist} +Release: 2%{?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/ @@ -71,12 +71,18 @@ Source11: dotnet.sh.in # Fix up a patch included in source-build to apply after we apply the linker-order patch first Patch1: source-build-runtime-fixup-linker-order.patch +# FIXME: upstream Fedora 35 RIDs; needed to unblock Fedora 35 for now +Patch2: source-build-rids.patch + # https://github.com/dotnet/runtime/pull/42094 # Fix linker order when linking with --as-needed Patch100: runtime-linker-order.patch # https://github.com/dotnet/runtime/pull/47020 # Fix build with gcc 11 Patch101: runtime-47020-gcc11.patch +# https://github.com/dotnet/runtime/pull/48203 +# Add Fedora 35 RID +Patch102: runtime-48203-fedora-35-rid.patch # Disable telemetry by default; make it opt-in Patch500: sdk-telemetry-optout.patch @@ -350,10 +356,12 @@ sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime.*/src/installer/core sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props %patch1 -p1 +%patch2 -p1 pushd src/runtime.* %patch100 -p1 %patch101 -p1 +%patch102 -p1 popd pushd src/sdk.* @@ -544,6 +552,9 @@ echo "Testing build results for debug symbols..." %changelog +* Wed Feb 17 2021 Omair Majid - 5.0.103-2 +- Add Fedora 35 RIDs + * Thu Feb 11 2021 Omair Majid - 5.0.103-1 - Update to .NET SDK 5.0.103 and Runtime 5.0.3 diff --git a/runtime-48203-fedora-35-rid.patch b/runtime-48203-fedora-35-rid.patch new file mode 100644 index 0000000..cb8d6ea --- /dev/null +++ b/runtime-48203-fedora-35-rid.patch @@ -0,0 +1,119 @@ +From e806448fdf844ca925c461b356b31363e844e902 Mon Sep 17 00:00:00 2001 +From: Omair Majid +Date: Thu, 11 Feb 2021 20:13:18 -0500 +Subject: [PATCH 1/2] Add Fedora 35 RID + +Fedora rawhide now uses the fedora.35-x64 RID: + + $ podman run -it registry.fedoraproject.org/fedora:rawhide /bin/bash -c 'cat /etc/os-release' + NAME=Fedora + VERSION="35 (Container Image Prerelease)" + ID=fedora + VERSION_ID=35 + VERSION_CODENAME="" + PLATFORM_ID="platform:f35" + PRETTY_NAME="Fedora 35 (Container Image Prerelease)" + ANSI_COLOR="0;38;2;60;110;180" + LOGO=fedora-logo-icon + CPE_NAME="cpe:/o:fedoraproject:fedora:35" + HOME_URL="https://fedoraproject.org/" + DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/rawhide/system-administrators-guide/" + SUPPORT_URL="https://fedoraproject.org/wiki/Communicating_and_getting_help" + BUG_REPORT_URL="https://bugzilla.redhat.com/" + REDHAT_BUGZILLA_PRODUCT="Fedora" + REDHAT_BUGZILLA_PRODUCT_VERSION=rawhide + REDHAT_SUPPORT_PRODUCT="Fedora" + REDHAT_SUPPORT_PRODUCT_VERSION=rawhide + PRIVACY_POLICY_URL="https://fedoraproject.org/wiki/Legal:PrivacyPolicy" + VARIANT="Container Image" + VARIANT_ID=container +--- + .../runtime.compatibility.json | 32 ++++++++++++++++++ + .../Microsoft.NETCore.Platforms/runtime.json | 17 ++++++++++ + .../runtimeGroups.props | 2 +- + 6 files changed, 69 insertions(+), 18 deletions(-) + +diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json +index 275929bf1fce..f56d7461e90c 100644 +--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json ++++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json +@@ -2376,6 +2376,38 @@ + "any", + "base" + ], ++ "fedora.35": [ ++ "fedora.35", ++ "fedora", ++ "linux", ++ "unix", ++ "any", ++ "base" ++ ], ++ "fedora.35-arm64": [ ++ "fedora.35-arm64", ++ "fedora.35", ++ "fedora-arm64", ++ "fedora", ++ "linux-arm64", ++ "linux", ++ "unix-arm64", ++ "unix", ++ "any", ++ "base" ++ ], ++ "fedora.35-x64": [ ++ "fedora.35-x64", ++ "fedora.35", ++ "fedora-x64", ++ "fedora", ++ "linux-x64", ++ "linux", ++ "unix-x64", ++ "unix", ++ "any", ++ "base" ++ ], + "freebsd": [ + "freebsd", + "unix", +diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json +index 5a2631cccd9a..3e8b2e74e85f 100644 +--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json ++++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtime.json +@@ -962,6 +962,23 @@ + "fedora-x64" + ] + }, ++ "fedora.35": { ++ "#import": [ ++ "fedora" ++ ] ++ }, ++ "fedora.35-arm64": { ++ "#import": [ ++ "fedora.35", ++ "fedora-arm64" ++ ] ++ }, ++ "fedora.35-x64": { ++ "#import": [ ++ "fedora.35", ++ "fedora-x64" ++ ] ++ }, + "freebsd": { + "#import": [ + "unix" +diff --git a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props +index 5bd4306409de..e78268c077fd 100644 +--- a/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props ++++ b/src/libraries/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props +@@ -60,7 +60,7 @@ + + linux + x64;arm64 +- 23;24;25;26;27;28;29;30;31;32;33;34 ++ 23;24;25;26;27;28;29;30;31;32;33;34;35 + false + + diff --git a/source-build-rids.patch b/source-build-rids.patch new file mode 100644 index 0000000..d81bcc2 --- /dev/null +++ b/source-build-rids.patch @@ -0,0 +1,13 @@ +diff --git a/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishCoreSetupBinaries.cs b/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishCoreSetupBinaries.cs +index 363fdeee..0a39a0d0 100644 +--- a/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishCoreSetupBinaries.cs ++++ b/tools-local/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/PublishCoreSetupBinaries.cs +@@ -46,6 +46,8 @@ namespace Microsoft.DotNet.Build.Tasks + ".fedora.32", "-fedora.32", + ".fedora.33", "-fedora.33", + ".fedora.34", "-fedora.34", ++ ".fedora.35", "-fedora.35", ++ ".fedora.36", "-fedora.36", + "-linux", ".linux", + "-osx", ".osx", + "-OSX", ".OSX",