Commit b8d16df4 authored by Rocky Automation's avatar Rocky Automation 📺
Browse files

import dotnet-2.1.522-1.el8_3

parent ef3ed333
diff -ur dotnet-v2.1.522-SDK/src/corefx/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json dotnet-v2.1.522-SDK-mod/src/corefx/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
--- dotnet-v2.1.522-SDK/src/corefx/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-02-24 13:34:30.000000000 -0500
+++ dotnet-v2.1.522-SDK-mod/src/corefx/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-04-15 14:26:23.278683414 -0500
@@ -7481,6 +7481,131 @@
"any",
"base"
],
+ "rocky": [
+ "rocky",
+ "rhel",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky-corert": [
+ "rocky-corert",
+ "rocky",
+ "rhel-corert",
+ "rhel",
+ "linux-corert",
+ "linux",
+ "unix-corert",
+ "unix",
+ "corert",
+ "any",
+ "base"
+ ],
+ "rocky-x64": [
+ "rocky-x64",
+ "rocky",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky-x64-corert": [
+ "rocky-x64-corert",
+ "rocky-corert",
+ "rocky-x64",
+ "rhel-x64-corert",
+ "rocky",
+ "rhel-corert",
+ "rhel-x64",
+ "linux-x64-corert",
+ "rhel",
+ "linux-corert",
+ "linux-x64",
+ "unix-x64-corert",
+ "linux",
+ "unix-corert",
+ "unix-x64",
+ "unix",
+ "corert",
+ "any",
+ "base"
+ ],
+ "rocky.8": [
+ "rocky.8",
+ "rocky",
+ "rhel.8",
+ "rhel",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8-corert": [
+ "rocky.8-corert",
+ "rocky.8",
+ "rocky-corert",
+ "rhel.8-corert",
+ "rocky",
+ "rhel.8",
+ "rhel-corert",
+ "rhel",
+ "linux-corert",
+ "linux",
+ "unix-corert",
+ "unix",
+ "corert",
+ "any",
+ "base"
+ ],
+ "rocky.8-x64": [
+ "rocky.8-x64",
+ "rocky.8",
+ "rocky-x64",
+ "rhel.8-x64",
+ "rocky",
+ "rhel.8",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8-x64-corert": [
+ "rocky.8-x64-corert",
+ "rocky.8-corert",
+ "rocky.8-x64",
+ "rocky.8",
+ "rocky-x64-corert",
+ "rocky-corert",
+ "rhel.8-corert",
+ "rocky-x64",
+ "rhel.8-x64",
+ "rocky",
+ "rhel.8",
+ "rhel-x64-corert",
+ "rhel-corert",
+ "rhel-x64",
+ "rhel",
+ "linux-x64-corert",
+ "linux-corert",
+ "linux-x64",
+ "linux",
+ "unix-x64-corert",
+ "unix-corert",
+ "unix-x64",
+ "unix",
+ "corert",
+ "any",
+ "base"
+ ],
"sles": [
"sles",
"linux",
@@ -12343,4 +12468,4 @@
"any",
"base"
]
-}
\ No newline at end of file
+}
diff -ur dotnet-v2.1.522-SDK/src/corefx/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v2.1.522-SDK-mod/src/corefx/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
--- dotnet-v2.1.522-SDK/src/corefx/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-02-24 13:34:30.000000000 -0500
+++ dotnet-v2.1.522-SDK-mod/src/corefx/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-04-15 14:27:15.281148973 -0500
@@ -116,6 +116,14 @@
<Versions>8;8.0;8.1</Versions>
</RuntimeGroup>
+ <RuntimeGroup Include="rocky">
+ <Parent>rhel</Parent>
+ <Architectures>x64</Architectures>
+ <Versions>8</Versions>
+ <ApplyVersionsToParent>true</ApplyVersionsToParent>
+ <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
+ </RuntimeGroup>
+
<RuntimeGroup Include="sles">
<Parent>linux</Parent>
<Architectures>x64</Architectures>
diff -ur dotnet-v2.1.522-SDK/src/corefx/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v2.1.522-SDK-mod/src/corefx/pkg/Microsoft.NETCore.Platforms/runtime.json
--- dotnet-v2.1.522-SDK/src/corefx/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-02-24 13:34:30.000000000 -0500
+++ dotnet-v2.1.522-SDK-mod/src/corefx/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-04-15 14:22:53.067843652 -0500
@@ -2640,6 +2640,58 @@
"rhel.8.0-x64-corert"
]
},
+ "rocky": {
+ "#import": [
+ "rhel"
+ ]
+ },
+ "rocky-corert": {
+ "#import": [
+ "rocky",
+ "rhel-corert"
+ ]
+ },
+ "rocky-x64": {
+ "#import": [
+ "rocky",
+ "rhel-x64"
+ ]
+ },
+ "rocky-x64-corert": {
+ "#import": [
+ "rocky-corert",
+ "rocky-x64",
+ "rhel-x64-corert"
+ ]
+ },
+ "rocky.8": {
+ "#import": [
+ "rocky",
+ "rhel.8"
+ ]
+ },
+ "rocky.8-corert": {
+ "#import": [
+ "rocky.8",
+ "rocky-corert",
+ "rhel.8-corert"
+ ]
+ },
+ "rocky.8-x64": {
+ "#import": [
+ "rocky.8",
+ "rocky-x64",
+ "rhel.8-x64"
+ ]
+ },
+ "rocky.8-x64-corert": {
+ "#import": [
+ "rocky.8-corert",
+ "rocky.8-x64",
+ "rocky.8",
+ "rocky-x64-corert"
+ ]
+ },
"sles": {
"#import": [
"linux"
@@ -4605,4 +4657,4 @@
]
}
}
-}
\ No newline at end of file
+}
......@@ -32,61 +32,62 @@
%global runtime_version 2.1.26
%global sdk_version 2.1.522
Name: dotnet
Version: %{sdk_version}
Release: 1%{?dist}
Summary: .NET Core CLI tools and runtime
License: MIT and ASL 2.0 and BSD
URL: https://github.com/dotnet/
Name: dotnet
Version: %{sdk_version}
Release: 1%{?dist}.rocky
Summary: .NET Core CLI tools and runtime
License: MIT and ASL 2.0 and BSD
URL: https://github.com/dotnet/
# The source is generated on a RHEL box via:
# ./build-dotnet-tarball v%%{sdk_version}-SDK
Source0: dotnet-v%{sdk_version}-SDK.tar.gz
Source1: check-debug-symbols.py
Source2: dotnet.sh
Source0: dotnet-v%{sdk_version}-SDK.tar.gz
Source1: check-debug-symbols.py
Source2: dotnet.sh
Patch10: corefx-optflags-support.patch
Patch11: corefx-32956-alpn.patch
Patch10: corefx-optflags-support.patch
Patch11: corefx-32956-alpn.patch
# This patch is generally applied at tarball-build time, except when we dont build the tarball
Patch12: build-corefx-disable-werror.patch
Patch12: build-corefx-disable-werror.patch
Patch100: coreclr-pie.patch
Patch101: coreclr-libunwind-fno-common.patch
Patch100: coreclr-pie.patch
Patch101: coreclr-libunwind-fno-common.patch
Patch300: core-setup-4510-commit-id.patch
Patch301: core-setup-pie.patch
Patch300: core-setup-4510-commit-id.patch
Patch301: core-setup-pie.patch
Patch400: cli-telemetry-optout.patch
Patch400: cli-telemetry-optout.patch
Patch401: core-rocky-rid.patch
ExclusiveArch: x86_64
ExclusiveArch: x86_64
BuildRequires: clang
BuildRequires: cmake
BuildRequires: clang
BuildRequires: cmake
# Bootstrap SDK needs OpenSSL 1.0 to run, but we can build and then
# run with either OpenSSL 1.0 or 1.1
%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8
BuildRequires: compat-openssl10
BuildRequires: compat-openssl10
%endif
BuildRequires: git
BuildRequires: glibc-langpack-en
BuildRequires: hostname
BuildRequires: krb5-devel
BuildRequires: libcurl-devel
BuildRequires: libicu-devel
BuildRequires: git
BuildRequires: glibc-langpack-en
BuildRequires: hostname
BuildRequires: krb5-devel
BuildRequires: libcurl-devel
BuildRequires: libicu-devel
%if ! %{use_bundled_libunwind}
BuildRequires: libunwind-devel
BuildRequires: libunwind-devel
%endif
BuildRequires: lldb-devel
BuildRequires: llvm
BuildRequires: lttng-ust-devel
BuildRequires: make
BuildRequires: openssl-devel
BuildRequires: python3
BuildRequires: strace
BuildRequires: zlib-devel
BuildRequires: lldb-devel
BuildRequires: llvm
BuildRequires: lttng-ust-devel
BuildRequires: make
BuildRequires: openssl-devel
BuildRequires: python3
BuildRequires: strace
BuildRequires: zlib-devel
Requires: %{simple_name}-sdk-2.1%{?_isa} >= %{sdk_version}-%{release}
Requires: %{simple_name}-sdk-2.1%{?_isa} >= %{sdk_version}-%{release}
%description
.NET Core is a fast, lightweight and modular platform for creating
......@@ -102,8 +103,8 @@ application to drive everything.
%package -n %{simple_name}-host
Version: %{host_version}
Summary: .NET command line launcher
Version: %{host_version}
Summary: .NET command line launcher
%description -n %{simple_name}-host
The .NET Core host is a command line program that runs a standalone
......@@ -118,12 +119,12 @@ applications and micro-services.
%package -n %{simple_name}-host-fxr-2.1
Version: %{host_version}
Summary: .NET Core command line host resolver
Version: %{host_version}
Summary: .NET Core command line host resolver
# Theoretically any version of the host should work. But lets aim for the one
# provided by this package, or from a newer version of .NET Core
Requires: %{simple_name}-host%{?_isa} >= %{host_version}-%{release}
Requires: %{simple_name}-host%{?_isa} >= %{host_version}-%{release}
%description -n %{simple_name}-host-fxr-2.1
The .NET Core host resolver contains logic to resolve and select the
......@@ -137,13 +138,13 @@ applications and micro-services.
%package -n %{simple_name}-runtime-2.1
Version: %{runtime_version}
Summary: NET Core 2.1 runtime
Version: %{runtime_version}
Summary: NET Core 2.1 runtime
Requires: %{simple_name}-host-fxr-2.1%{?_isa} >= %{host_version}-%{release}
Requires: %{simple_name}-host-fxr-2.1%{?_isa} >= %{host_version}-%{release}
# libicu is dlopen()ed
Requires: libicu
Requires: libicu
%description -n %{simple_name}-runtime-2.1
The .NET Core runtime contains everything needed to run .NET Core applications.
......@@ -158,10 +159,10 @@ applications and micro-services.
%package -n %{simple_name}-sdk-2.1
Version: %{sdk_version}
Summary: .NET Core 2.1 Software Development Kit
Version: %{sdk_version}
Summary: .NET Core 2.1 Software Development Kit
Requires: %{simple_name}-sdk-2.1.5xx%{?_isa} >= %{sdk_version}-%{release}
Requires: %{simple_name}-sdk-2.1.5xx%{?_isa} >= %{sdk_version}-%{release}
%description -n %{simple_name}-sdk-2.1
The .NET Core SDK is a collection of command line applications to
......@@ -175,10 +176,10 @@ applications and micro-services.
%package -n %{simple_name}-sdk-2.1.5xx
Version: %{sdk_version}
Summary: .NET Core 2.1.5xx Software Development Kit
Version: %{sdk_version}
Summary: .NET Core 2.1.5xx Software Development Kit
Requires: %{simple_name}-runtime-2.1%{?_isa} >= %{runtime_version}-%{release}
Requires: %{simple_name}-runtime-2.1%{?_isa} >= %{runtime_version}-%{release}
%description -n %{simple_name}-sdk-2.1.5xx
The .NET Core SDK is a collection of command line applications to
......@@ -231,6 +232,7 @@ sed -i 's|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|-DCLR_CMAKE_USE_SYSTEM_LIBUNWIND
cat source-build-info.txt
%patch401 -p1
%build
export DOTNET_CLI_TELEMETRY_OPTOUT=1
......@@ -317,6 +319,9 @@ rm %{buildroot}%{_libdir}/%{simple_name}/dotnet
%{_libdir}/%{simple_name}/sdk/%{sdk_version}
%changelog
* Thu Apr 15 2021 Michael L. Young <elgueromexicano@gmail.com> - 2.1.522-1.rocky
- Add Rocky Runtime ID
* Tue Mar 02 2021 Omair Majid <omajid@redhat.com> - 2.1.522-1
- Update to .NET Core SDK 2.1.522 and Runtime 2.1.26
- Resolves: RHBZ#1933844
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment