125 lines
3.8 KiB
Diff
125 lines
3.8 KiB
Diff
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>
|
|
|