139 lines
4.6 KiB
Diff
139 lines
4.6 KiB
Diff
From d5aa0f0e93448a9defc901e98a70b00e26359d46 Mon Sep 17 00:00:00 2001
|
|
From: Omair Majid <omajid@redhat.com>
|
|
Date: Mon, 22 Aug 2022 11:48:00 -0400
|
|
Subject: [PATCH] Add Fedora 38 RID
|
|
|
|
Fedora 38 is now in development:
|
|
|
|
$ podman run -it registry.fedoraproject.org/fedora:rawhide
|
|
[root@d3934d2b267b /]# cat /etc/os-release
|
|
NAME="Fedora Linux"
|
|
VERSION="38 (Container Image Prerelease)"
|
|
ID=fedora
|
|
VERSION_ID=38
|
|
VERSION_CODENAME=""
|
|
PLATFORM_ID="platform:f38"
|
|
PRETTY_NAME="Fedora Linux 38 (Container Image Prerelease)"
|
|
ANSI_COLOR="0;38;2;60;110;180"
|
|
LOGO=fedora-logo-icon
|
|
CPE_NAME="cpe:/o:fedoraproject:fedora:38"
|
|
DEFAULT_HOSTNAME="fedora"
|
|
HOME_URL="https://fedoraproject.org/"
|
|
DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/rawhide/system-administrators-guide/"
|
|
SUPPORT_URL="https://ask.fedoraproject.org/"
|
|
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
|
|
VARIANT="Container Image"
|
|
VARIANT_ID=container
|
|
---
|
|
.../src/Microsoft.NETCore.Platforms.csproj | 3 +-
|
|
.../src/runtime.compatibility.json | 32 +++++++++++++++++++
|
|
.../src/runtime.json | 17 ++++++++++
|
|
.../src/runtimeGroups.props | 2 +-
|
|
4 files changed, 52 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
|
|
index e324ea113d2..262b0aae1a8 100644
|
|
--- a/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
|
|
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/Microsoft.NETCore.Platforms.csproj
|
|
@@ -19,7 +19,8 @@
|
|
|
|
<!-- When building from source, ensure the RID we're building for is part of the RID graph -->
|
|
<AdditionalRuntimeIdentifiers Condition="'$(DotNetBuildFromSource)' == 'true'">$(AdditionalRuntimeIdentifiers);$(OutputRID)</AdditionalRuntimeIdentifiers>
|
|
- <ServicingVersion>5</ServicingVersion>
|
|
+ <ServicingVersion>6</ServicingVersion>
|
|
+ <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
|
|
</PropertyGroup>
|
|
|
|
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
|
|
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
|
|
index f4aebcb7147..dce6a7f5346 100644
|
|
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
|
|
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.compatibility.json
|
|
@@ -3182,6 +3182,38 @@
|
|
"any",
|
|
"base"
|
|
],
|
|
+ "fedora.38": [
|
|
+ "fedora.38",
|
|
+ "fedora",
|
|
+ "linux",
|
|
+ "unix",
|
|
+ "any",
|
|
+ "base"
|
|
+ ],
|
|
+ "fedora.38-arm64": [
|
|
+ "fedora.38-arm64",
|
|
+ "fedora.38",
|
|
+ "fedora-arm64",
|
|
+ "fedora",
|
|
+ "linux-arm64",
|
|
+ "linux",
|
|
+ "unix-arm64",
|
|
+ "unix",
|
|
+ "any",
|
|
+ "base"
|
|
+ ],
|
|
+ "fedora.38-x64": [
|
|
+ "fedora.38-x64",
|
|
+ "fedora.38",
|
|
+ "fedora-x64",
|
|
+ "fedora",
|
|
+ "linux-x64",
|
|
+ "linux",
|
|
+ "unix-x64",
|
|
+ "unix",
|
|
+ "any",
|
|
+ "base"
|
|
+ ],
|
|
"freebsd": [
|
|
"freebsd",
|
|
"unix",
|
|
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
|
|
index fb2ea2da7c0..a7867d81727 100644
|
|
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
|
|
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtime.json
|
|
@@ -1186,6 +1186,23 @@
|
|
"fedora-x64"
|
|
]
|
|
},
|
|
+ "fedora.38": {
|
|
+ "#import": [
|
|
+ "fedora"
|
|
+ ]
|
|
+ },
|
|
+ "fedora.38-arm64": {
|
|
+ "#import": [
|
|
+ "fedora.38",
|
|
+ "fedora-arm64"
|
|
+ ]
|
|
+ },
|
|
+ "fedora.38-x64": {
|
|
+ "#import": [
|
|
+ "fedora.38",
|
|
+ "fedora-x64"
|
|
+ ]
|
|
+ },
|
|
"freebsd": {
|
|
"#import": [
|
|
"unix"
|
|
diff --git a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
|
|
index 479e1397e7a..ce8cc1d22b7 100644
|
|
--- a/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
|
|
+++ b/src/libraries/Microsoft.NETCore.Platforms/src/runtimeGroups.props
|
|
@@ -71,7 +71,7 @@
|
|
<RuntimeGroup Include="fedora">
|
|
<Parent>linux</Parent>
|
|
<Architectures>x64;arm64</Architectures>
|
|
- <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35;36;37</Versions>
|
|
+ <Versions>23;24;25;26;27;28;29;30;31;32;33;34;35;36;37;38</Versions>
|
|
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
|
|
</RuntimeGroup>
|
|
|
|
--
|
|
2.37.2
|
|
|