Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/dotnet3.1.git#967ac74c2a2ad1be5821b989754b83967458a4ee
This commit is contained in:
DistroBaker
parent
5d1a2c1f68
commit
1a2eee7aa1
|
|
@ -0,0 +1,124 @@
|
|||
From 66d0116c74a33e43b171f3ef5323e8a3883ceb18 Mon Sep 17 00:00:00 2001
|
||||
From: Omair Majid <omajid@redhat.com>
|
||||
Date: Fri, 12 Feb 2021 11:01:36 -0500
|
||||
Subject: [PATCH] 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
|
||||
|
||||
This is a backport of https://github.com/dotnet/runtime/pull/48200.
|
||||
---
|
||||
eng/Packaging.props | 2 +-
|
||||
.../runtime.compatibility.json | 32 +++++++++++++++++++
|
||||
pkg/Microsoft.NETCore.Platforms/runtime.json | 17 ++++++++++
|
||||
.../runtimeGroups.props | 2 +-
|
||||
.../packageIndex.json | 5 +--
|
||||
src/packages.builds | 3 ++
|
||||
6 files changed, 57 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
|
||||
index 382ee4552177..bb045b0856f1 100644
|
||||
--- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
|
||||
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
|
||||
@@ -1102,6 +1102,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/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
|
||||
index a50be8567ce0..10b204def550 100644
|
||||
--- a/pkg/Microsoft.NETCore.Platforms/runtime.json
|
||||
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
|
||||
@@ -544,6 +544,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/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
|
||||
index faa697f34e20..8b9c2e47ba2d 100644
|
||||
--- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
|
||||
+++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
|
||||
@@ -43,7 +43,7 @@
|
||||
<RuntimeGroup Include="fedora">
|
||||
<Parent>linux</Parent>
|
||||
<Architectures>x64;arm64</Architectures>
|
||||
- <Versions>23;24;25;26;27;28;29;30;31;32;33;34</Versions>
|
||||
+ <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35</Versions>
|
||||
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
|
||||
</RuntimeGroup>
|
||||
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
|
||||
Name: dotnet3.1
|
||||
Version: %{sdk_rpm_version}
|
||||
Release: 1%{?dist}
|
||||
Release: 3%{?dist}
|
||||
Summary: .NET Core 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/
|
||||
|
|
@ -77,6 +77,9 @@ Patch101: corefx-39686-cgroupv2-01.patch
|
|||
Patch102: corefx-39686-cgroupv2-02.patch
|
||||
Patch103: corefx-39633-cgroupv2-mountpoints.patch
|
||||
|
||||
# https://github.com/dotnet/corefx/pull/43032
|
||||
Patch104: corefx-43032-fedora-35-rid.patch
|
||||
|
||||
# Build with with hardening flags, including -pie
|
||||
Patch200: coreclr-hardening-flags.patch
|
||||
# Fix build with clang 10; Already applied at tarball-build time
|
||||
|
|
@ -360,6 +363,7 @@ pushd src/corefx.*
|
|||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
%patch103 -p1
|
||||
%patch104 -p1
|
||||
popd
|
||||
|
||||
pushd src/coreclr.*
|
||||
|
|
@ -402,6 +406,16 @@ cat /etc/os-release
|
|||
%if %{without bootstrap}
|
||||
# We need to create a copy because we will mutate this
|
||||
cp -a %{_libdir}/dotnet previously-built-dotnet
|
||||
|
||||
# .NET Core 3.1 doesn't (yet) know about RHEL 9, so lets hack the RHEL
|
||||
# 9 RID into there, for now. This hack can be removed when the 3.1.112
|
||||
# SDK is available in the buildroot.
|
||||
%if 0%{?rhel} == 9
|
||||
find -iname RuntimeIdentifierGraph.json
|
||||
cat $(find -iname RuntimeIdentifierGraph.json)
|
||||
sed -i -e 's|rhel.8|rhel.9|g' $(find -iname RuntimeIdentifierGraph.json)
|
||||
%endif
|
||||
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} > 32 || 0%{?rhel} > 8
|
||||
|
|
@ -556,6 +570,12 @@ echo "Testing build results for debug symbols..."
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Feb 17 2021 Omair Majid <omajid@redhat.com> - 3.1.112-3
|
||||
- Hack an RID for RHEL 9 into the build SDK
|
||||
|
||||
* Wed Feb 17 2021 Omair Majid <omajid@redhat.com> - 3.1.112-2
|
||||
- Add Fedora 35 Runtime ID
|
||||
|
||||
* Fri Feb 12 2021 Omair Majid <omajid@redhat.com> - 3.1.112-1
|
||||
- Update to .NET Core SDK 3.1.112 and Runtime 3.1.12
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue