125 lines
3.7 KiB
Diff
125 lines
3.7 KiB
Diff
From 6cf4ff086875eaf29381cf406ea85846d9f66178 Mon Sep 17 00:00:00 2001
|
|
From: Omair Majid <omajid@redhat.com>
|
|
Date: Mon, 24 Feb 2020 14:11:03 -0500
|
|
Subject: [PATCH] Add Fedora 33 runtime ids
|
|
|
|
Fedora 32 is gearing up for release[1], and in-development version of
|
|
Fedora has been offically labelled as being Fedora 33:
|
|
|
|
$ podman run -it fedora:33 cat /etc/os-release
|
|
NAME=Fedora
|
|
VERSION="33 (Container Image)"
|
|
ID=fedora
|
|
VERSION_ID=33
|
|
VERSION_CODENAME=""
|
|
PLATFORM_ID="platform:f33"
|
|
PRETTY_NAME="Fedora 33 (Container Image)"
|
|
ANSI_COLOR="0;34"
|
|
LOGO=fedora-logo-icon
|
|
CPE_NAME="cpe:/o:fedoraproject:fedora:33"
|
|
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
|
|
|
|
[1] https://fedorapeople.org/groups/schedule/f-32/f-32-key-tasks.html
|
|
---
|
|
eng/Packaging.props | 2 +-
|
|
.../runtime.compatibility.json | 32 +++++++++++++++++++
|
|
pkg/Microsoft.NETCore.Platforms/runtime.json | 17 ++++++++++
|
|
.../runtimeGroups.props | 2 +-
|
|
src/packages.builds | 3 ++
|
|
5 files changed, 54 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
|
|
index 1e5c380a7a6a..c20e35394d6b 100644
|
|
--- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
|
|
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
|
|
@@ -953,6 +953,38 @@
|
|
"any",
|
|
"base"
|
|
],
|
|
+ "fedora.33": [
|
|
+ "fedora.33",
|
|
+ "fedora",
|
|
+ "linux",
|
|
+ "unix",
|
|
+ "any",
|
|
+ "base"
|
|
+ ],
|
|
+ "fedora.33-arm64": [
|
|
+ "fedora.33-arm64",
|
|
+ "fedora.33",
|
|
+ "fedora-arm64",
|
|
+ "fedora",
|
|
+ "linux-arm64",
|
|
+ "linux",
|
|
+ "unix-arm64",
|
|
+ "unix",
|
|
+ "any",
|
|
+ "base"
|
|
+ ],
|
|
+ "fedora.33-x64": [
|
|
+ "fedora.33-x64",
|
|
+ "fedora.33",
|
|
+ "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 b2f286ea2479..b3380ecbbef3 100644
|
|
--- a/pkg/Microsoft.NETCore.Platforms/runtime.json
|
|
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
|
|
@@ -488,6 +488,23 @@
|
|
"fedora-x64"
|
|
]
|
|
},
|
|
+ "fedora.33": {
|
|
+ "#import": [
|
|
+ "fedora"
|
|
+ ]
|
|
+ },
|
|
+ "fedora.33-arm64": {
|
|
+ "#import": [
|
|
+ "fedora.33",
|
|
+ "fedora-arm64"
|
|
+ ]
|
|
+ },
|
|
+ "fedora.33-x64": {
|
|
+ "#import": [
|
|
+ "fedora.33",
|
|
+ "fedora-x64"
|
|
+ ]
|
|
+ },
|
|
"freebsd": {
|
|
"#import": [
|
|
"unix"
|
|
diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
|
|
index eeb8130b54fb..da48e5f9d09f 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</Versions>
|
|
+ <Versions>23;24;25;26;27;28;29;30;31;32;33</Versions>
|
|
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
|
|
</RuntimeGroup>
|
|
|