rpms
/
dotnet3.1
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to .NET SDK 3.1.116 and Runtime 3.1.16 

Resolves: RHBZ#1961848
This commit is contained in:
Omair Majid 2021-06-12 18:54:27 -04:00
parent b9eb75e9ea
commit ba6164a282
4 changed files with 10 additions and 230 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -14,3 +14,4 @@
/dotnet-v3.1.112-SDK.tar.gz
/dotnet-v3.1.113-SDK.tar.gz
/dotnet-v3.1.115-SDK.tar.gz
/dotnet-v3.1.116-SDK.tar.gz

220
corefx-43068-centos-9-rid.patch
View File

@ -1,220 +0,0 @@
From 99ce8c8010296b48745edcfab9ea9cb3abf50ed1 Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Tue, 20 Apr 2021 11:52:13 -0400
Subject: [PATCH] Add CentOS 9 RID and make CentOS 8 arm64 as well
This is the only part of https://github.com/dotnet/runtime/pull/34088
that wasn't already backported to release/3.1.
https://www.redhat.com/en/blog/faq-centos-stream-updates says:
> There will not be a CentOS Linux 9.
>
> CentOS Stream 9 will launch in Q2 2021 as part of the RHEL 9
> development process.
The last part also means that the current parent-child relationship that
we use for RHEL->CentOS in our RID graph will flip starting in 9. I dont
see any immediate impact, so I think we can leave it alone for now.
I got a (currently internal) build of CentOS Stream 9 and
/etc/os-release looks like this:
$ cat /etc/os-release
NAME="CentOS Stream"
VERSION="9"
ID="centos"
ID_LIKE="rhel fedora"
VERSION_ID="9"
PLATFORM_ID="platform:el9"
PRETTY_NAME="CentOS Stream 9"
ANSI_COLOR="0;31"
CPE_NAME="cpe:/o:centos:centos:9"
HOME_URL="https://centos.org/"
BUG_REPORT_URL="https://bugzilla.redhat.com/"
REDHAT_SUPPORT_PRODUCT="Red Hat Enterprise Linux 9"
REDHAT_SUPPORT_PRODUCT_VERSION="CentOS Stream"
---
.../runtime.compatibility.json | 72 ++++++++++++++++++-
pkg/Microsoft.NETCore.Platforms/runtime.json | 35 ++++++++-
.../runtimeGroups.props | 9 ++-
.../packageIndex.json | 3 +-
src/packages.builds | 3 +
6 files changed, 119 insertions(+), 5 deletions(-)
diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
index 29bd92af0b..da7345623e 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
@@ -366,6 +366,18 @@
"any",
"base"
],
+ "centos-arm64": [
+ "centos-arm64",
+ "centos",
+ "rhel-arm64",
+ "rhel",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
"centos-x64": [
"centos-x64",
"centos",
@@ -414,6 +426,22 @@
"any",
"base"
],
+ "centos.8-arm64": [
+ "centos.8-arm64",
+ "centos.8",
+ "centos-arm64",
+ "rhel.8-arm64",
+ "centos",
+ "rhel.8",
+ "rhel-arm64",
+ "rhel",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
"centos.8-x64": [
"centos.8-x64",
"centos.8",
@@ -430,6 +458,48 @@
"any",
"base"
],
+ "centos.9": [
+ "centos.9",
+ "centos",
+ "rhel.9",
+ "rhel",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "centos.9-arm64": [
+ "centos.9-arm64",
+ "centos.9",
+ "centos-arm64",
+ "rhel.9-arm64",
+ "centos",
+ "rhel.9",
+ "rhel-arm64",
+ "rhel",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "centos.9-x64": [
+ "centos.9-x64",
+ "centos.9",
+ "centos-x64",
+ "rhel.9-x64",
+ "centos",
+ "rhel.9",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
"debian": [
"debian",
"linux",
diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
index 0bcd543a3b..608a034808 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtime.json
+++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
@@ -151,6 +151,12 @@
"rhel"
]
},
+ "centos-arm64": {
+ "#import": [
+ "centos",
+ "rhel-arm64"
+ ]
+ },
"centos-x64": {
"#import": [
"centos",
@@ -176,6 +182,13 @@
"rhel.8"
]
},
+ "centos.8-arm64": {
+ "#import": [
+ "centos.8",
+ "centos-arm64",
+ "rhel.8-arm64"
+ ]
+ },
"centos.8-x64": {
"#import": [
"centos.8",
@@ -183,6 +196,26 @@
"rhel.8-x64"
]
},
+ "centos.9": {
+ "#import": [
+ "centos",
+ "rhel.9"
+ ]
+ },
+ "centos.9-arm64": {
+ "#import": [
+ "centos.9",
+ "centos-arm64",
+ "rhel.9-arm64"
+ ]
+ },
+ "centos.9-x64": {
+ "#import": [
+ "centos.9",
+ "centos-x64",
+ "rhel.9-x64"
+ ]
+ },
"debian": {
"#import": [
"linux"
diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
index 52b3659651..0e8d06dddd 100644
--- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
@@ -28,7 +28,14 @@
<RuntimeGroup Include="centos">
<Parent>rhel</Parent>
<Architectures>x64</Architectures>
- <Versions>7;8</Versions>
+ <Versions>7</Versions>
+ <ApplyVersionsToParent>true</ApplyVersionsToParent>
+ <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
+ </RuntimeGroup>
+ <RuntimeGroup Include="centos">
+ <Parent>rhel</Parent>
+ <Architectures>x64;arm64</Architectures>
+ <Versions>8;9</Versions>
<ApplyVersionsToParent>true</ApplyVersionsToParent>
<TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
</RuntimeGroup>
--
2.30.2

17
dotnet3.1.spec
View File

@ -21,10 +21,10 @@
%define _lto_cflags %{nil}
%global host_version 3.1.15
%global runtime_version 3.1.15
%global host_version 3.1.16
%global runtime_version 3.1.16
%global aspnetcore_runtime_version %{runtime_version}
%global sdk_version 3.1.115
%global sdk_version 3.1.116
# upstream can update releases without revving the SDK version so these don't always match
%global src_version %{sdk_version}
%global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
@ -55,7 +55,7 @@
Name: dotnet3.1
Version: %{sdk_rpm_version}
Release: 2%{?dist}
Release: 1%{?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/
@ -78,9 +78,6 @@ Patch101: corefx-39686-cgroupv2-01.patch
Patch102: corefx-39686-cgroupv2-02.patch
Patch103: corefx-39633-cgroupv2-mountpoints.patch
# https://github.com/dotnet/corefx/pull/43068
Patch105: corefx-43068-centos-9-rid.patch
# https://github.com/dotnet/corefx/pull/43078
Patch106: corefx-openssl-0001-Use-EVP_PKEY-for-RSA-key-generation.patch
Patch107: corefx-openssl-0002-Use-EVP_PKEY-for-RSA-Decrypt.patch
@ -355,7 +352,6 @@ rm -rf packages/source-built
%endif
%if %{without bootstrap}
sed -i -e 's|3.1.100-preview1-014459|3.1.103|' global.json
mkdir -p packages/archive
ln -s %{_libdir}/dotnet/source-built-artifacts/*.tar.gz packages/archive/
ln -s %{_libdir}/dotnet/reference-packages/Private.SourceBuild.ReferencePackages*.tar.gz packages/archive
@ -375,7 +371,6 @@ pushd src/corefx.*
%patch101 -p1
%patch102 -p1
%patch103 -p1
%patch105 -p1
%patch106 -p1
%patch107 -p1
%patch108 -p1
@ -580,6 +575,10 @@ echo "Testing build results for debug symbols..."
%changelog
* Fri Jun 11 2021 Omair Majid <omajid@redhat.com> - 3.1.116-1
- Update to .NET SDK 3.1.116 and Runtime 3.1.16
- Resolves: RHBZ#1961848
* Mon Jun 07 2021 Omair Majid <omajid@redhat.com> - 3.1.115-2
- Support building against OpenSSL 3.0
- Resolves: RHBZ#1965045

2
sources
View File

@ -1 +1 @@
SHA512 (dotnet-v3.1.115-SDK.tar.gz) = f991505c0f34be5847acdec1197c99579cdcaba5f1ef8e314e0cb52ce667a80436e99e69acf236c5d6217516a730d9b9360799867657d9dc1d1d12e2addc43f6
SHA512 (dotnet-v3.1.116-SDK.tar.gz) = 5c3eea2936065480fe829448ef8d3f9c858503d1c15c8d46fcdb01fd345dea649cd1a7207e888ae52210bf98c9e7a9076095d3b9095170e4900e2ce9cebc1812