Commit 93b5680c authored by Rocky Automation's avatar Rocky Automation 📺
Browse files

import dotnet3.1-3.1.113-1.el8_3

parent 26f16eb4
--- dotnet-v3.1.113-SDK/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-02-24 16:45:07.000000000 -0500
+++ dotnet-v3.1.113-SDK-mod/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json 2021-04-14 11:39:13.696935030 -0500
@@ -3085,6 +3085,81 @@
"any",
"base"
],
+ "rocky": [
+ "rocky",
+ "rhel",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky-arm64": [
+ "rocky-arm64",
+ "rocky",
+ "rhel-arm64",
+ "rhel",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky-x64": [
+ "rocky-x64",
+ "rocky",
+ "rhel-x64",
+ "rhel",
+ "linux-x64",
+ "linux",
+ "unix-x64",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8": [
+ "rocky.8",
+ "rocky",
+ "rhel.8",
+ "rhel",
+ "linux",
+ "unix",
+ "any",
+ "base"
+ ],
+ "rocky.8-arm64": [
+ "rocky.8-arm64",
+ "rocky.8",
+ "rocky-arm64",
+ "rhel.8-arm64",
+ "rocky",
+ "rhel.8",
+ "rhel-arm64",
+ "rhel",
+ "linux-arm64",
+ "linux",
+ "unix-arm64",
+ "unix",
+ "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"
+ ],
+
"sles": [
"sles",
"linux",
@@ -5106,4 +5181,4 @@
"any",
"base"
]
-}
\ No newline at end of file
+}
diff -ur dotnet-v3.1.113-SDK/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props dotnet-v3.1.113-SDK-mod/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
--- dotnet-v3.1.113-SDK/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-02-24 16:45:07.000000000 -0500
+++ dotnet-v3.1.113-SDK-mod/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props 2021-04-14 11:46:56.998806793 -0500
@@ -125,6 +125,14 @@
<Versions>9</Versions>
</RuntimeGroup>
+ <RuntimeGroup Include="rocky">
+ <Parent>rhel</Parent>
+ <Architectures>x64;arm64</Architectures>
+ <Versions>8</Versions>
+ <ApplyVersionsToParent>true</ApplyVersionsToParent>
+ <TreatVersionsAsCompatible>false</TreatVersionsAsCompatible>
+ </RuntimeGroup>
+
<RuntimeGroup Include="sles">
<Parent>linux</Parent>
<Architectures>x64</Architectures>
diff -ur dotnet-v3.1.113-SDK/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e/pkg/Microsoft.NETCore.Platforms/runtime.json dotnet-v3.1.113-SDK-mod/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e/pkg/Microsoft.NETCore.Platforms/runtime.json
--- dotnet-v3.1.113-SDK/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-02-24 16:45:07.000000000 -0500
+++ dotnet-v3.1.113-SDK-mod/src/dotnet-corefx.9299d909ff6c03c664a3f9a3ef995a9fa2eeec3e/pkg/Microsoft.NETCore.Platforms/runtime.json 2021-04-14 11:43:24.367703508 -0500
@@ -1367,6 +1367,43 @@
"rhel-x64"
]
},
+ "rocky": {
+ "#import": [
+ "rhel"
+ ]
+ },
+ "rocky-arm64": {
+ "#import": [
+ "rocky",
+ "rhel-arm64"
+ ]
+ },
+ "rocky-x64": {
+ "#import": [
+ "rocky",
+ "rhel-x64"
+ ]
+ },
+ "rocky.8": {
+ "#import": [
+ "rocky",
+ "rhel.8"
+ ]
+ },
+ "rocky.8-arm64": {
+ "#import": [
+ "rocky.8",
+ "rocky-arm64",
+ "rhel.8-arm64"
+ ]
+ },
+ "rocky.8-x64": {
+ "#import": [
+ "rocky.8",
+ "rocky-x64",
+ "rhel.8-x64"
+ ]
+ },
"sles": {
"#import": [
"linux"
@@ -2329,4 +2366,4 @@
]
}
}
-}
\ No newline at end of file
+}
......@@ -50,63 +50,64 @@
%if 0%{?fedora}
%global runtime_id fedora.%{fedora}-%{runtime_arch}
%else
%if 0%{?centos}
%global runtime_id centos.%{centos}-%{runtime_arch}
%if 0%{?rocky}
%global runtime_id rocky.%{rocky}-%{runtime_arch}
%else
%global runtime_id rhel.%{rhel}-%{runtime_arch}
%endif
%endif
Name: dotnet3.1
Version: %{sdk_rpm_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: dotnet3.1
Version: %{sdk_rpm_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/
# ./build-dotnet-tarball dotnet-v%%{sdk_version}-SDK
Source0: dotnet-v%{sdk_version}-SDK.tar.gz
Source0: dotnet-v%{sdk_version}-SDK.tar.gz
#Source1: dotnet-v%%{sdk_version}-SDK-rhel.8-arm64.tar.gz
Source100: check-debug-symbols.py
Source101: dotnet.sh.in
Source100: check-debug-symbols.py
Source101: dotnet.sh.in
Patch100: corefx-optflags-support.patch
Patch103: corefx-39633-cgroupv2-mountpoints.patch
Patch104: corefx-hardening-flags.patch
Patch100: corefx-optflags-support.patch
Patch103: corefx-39633-cgroupv2-mountpoints.patch
Patch104: corefx-hardening-flags.patch
Patch200: coreclr-27048-sysctl-deprecation.patch
Patch201: coreclr-hardening-flags.patch
Patch202: coreclr-libunwind-fno-common.patch
Patch200: coreclr-27048-sysctl-deprecation.patch
Patch201: coreclr-hardening-flags.patch
Patch202: coreclr-libunwind-fno-common.patch
Patch300: core-setup-do-not-strip.patch
Patch301: core-setup-hardening-flags.patch
Patch300: core-setup-do-not-strip.patch
Patch301: core-setup-hardening-flags.patch
Patch500: cli-telemetry-optout.patch
Patch500: cli-telemetry-optout.patch
Patch501: core-rocky-rid.patch
ExclusiveArch: x86_64
ExclusiveArch: x86_64
BuildRequires: clang
BuildRequires: cmake
BuildRequires: coreutils
BuildRequires: git
BuildRequires: clang
BuildRequires: cmake
BuildRequires: coreutils
BuildRequires: git
%if 0%{?fedora} || 0%{?rhel} > 7
BuildRequires: glibc-langpack-en
BuildRequires: glibc-langpack-en
%endif
BuildRequires: hostname
BuildRequires: krb5-devel
BuildRequires: libcurl-devel
BuildRequires: libicu-devel
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: openssl-devel
BuildRequires: python3
BuildRequires: tar
BuildRequires: zlib-devel
BuildRequires: lldb-devel
BuildRequires: llvm
BuildRequires: lttng-ust-devel
BuildRequires: openssl-devel
BuildRequires: python3
BuildRequires: tar
BuildRequires: zlib-devel
%description
.NET Core is a fast, lightweight and modular platform for creating
......@@ -122,10 +123,10 @@ application to drive everything.
%package -n dotnet
Version: %{sdk_rpm_version}
Summary: .NET Core CLI tools and runtime
Version: %{sdk_rpm_version}
Summary: .NET Core CLI tools and runtime
Requires: dotnet-sdk-3.1%{?_isa} >= %{sdk_rpm_version}-%{release}
Requires: dotnet-sdk-3.1%{?_isa} >= %{sdk_rpm_version}-%{release}
%description -n dotnet
.NET Core is a fast, lightweight and modular platform for creating
......@@ -141,8 +142,8 @@ application to drive everything.
%package -n dotnet-host
Version: %{host_rpm_version}
Summary: .NET command line launcher
Version: %{host_rpm_version}
Summary: .NET command line launcher
%description -n dotnet-host
The .NET Core host is a command line program that runs a standalone
......@@ -157,12 +158,12 @@ applications and micro-services.
%package -n dotnet-hostfxr-3.1
Version: %{host_rpm_version}
Summary: .NET Core command line host resolver
Version: %{host_rpm_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: dotnet-host%{?_isa} >= %{host_rpm_version}-%{release}
Requires: dotnet-host%{?_isa} >= %{host_rpm_version}-%{release}
%description -n dotnet-hostfxr-3.1
The .NET Core host resolver contains the logic to resolve and select
......@@ -177,16 +178,16 @@ applications and micro-services.
%package -n dotnet-runtime-3.1
Version: %{runtime_rpm_version}
Summary: NET Core 3.1 runtime
Version: %{runtime_rpm_version}
Summary: NET Core 3.1 runtime
Requires: dotnet-hostfxr-3.1%{?_isa} >= %{host_rpm_version}-%{release}
Requires: dotnet-hostfxr-3.1%{?_isa} >= %{host_rpm_version}-%{release}
# libicu is dlopen()ed
Requires: libicu
Requires: libicu
%if %{use_bundled_libunwind}
Provides: bundled(libunwind) = 1.3
Provides: bundled(libunwind) = 1.3
%endif
%description -n dotnet-runtime-3.1
......@@ -203,10 +204,10 @@ applications and micro-services.
%package -n aspnetcore-runtime-3.1
Version: %{aspnetcore_runtime_rpm_version}
Summary: ASP.NET Core 3.1 runtime
Version: %{aspnetcore_runtime_rpm_version}
Summary: ASP.NET Core 3.1 runtime
Requires: dotnet-runtime-3.1%{?_isa} >= %{runtime_rpm_version}-%{release}
Requires: dotnet-runtime-3.1%{?_isa} >= %{runtime_rpm_version}-%{release}
%description -n aspnetcore-runtime-3.1
The ASP.NET Core runtime contains everything needed to run .NET Core
......@@ -222,12 +223,12 @@ applications and micro-services.
%package -n dotnet-templates-3.1
Version: %{sdk_rpm_version}
Summary: .NET Core 3.1 templates
Version: %{sdk_rpm_version}
Summary: .NET Core 3.1 templates
# 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: dotnet-host%{?_isa} >= %{host_rpm_version}-%{release}
Requires: dotnet-host%{?_isa} >= %{host_rpm_version}-%{release}
%description -n dotnet-templates-3.1
This package contains templates used by the .NET Core SDK.
......@@ -241,18 +242,18 @@ applications and micro-services.
%package -n dotnet-sdk-3.1
Version: %{sdk_rpm_version}
Summary: .NET Core 3.1 Software Development Kit
Version: %{sdk_rpm_version}
Summary: .NET Core 3.1 Software Development Kit
Requires: dotnet-runtime-3.1%{?_isa} >= %{runtime_rpm_version}-%{release}
Requires: aspnetcore-runtime-3.1%{?_isa} >= %{aspnetcore_runtime_rpm_version}-%{release}
Requires: dotnet-runtime-3.1%{?_isa} >= %{runtime_rpm_version}-%{release}
Requires: aspnetcore-runtime-3.1%{?_isa} >= %{aspnetcore_runtime_rpm_version}-%{release}
Requires: dotnet-apphost-pack-3.1%{?_isa} >= %{runtime_rpm_version}-%{release}
Requires: dotnet-targeting-pack-3.1%{?_isa} >= %{runtime_rpm_version}-%{release}
Requires: aspnetcore-targeting-pack-3.1%{?_isa} >= %{aspnetcore_runtime_rpm_version}-%{release}
Requires: netstandard-targeting-pack-2.1%{?_isa} >= %{sdk_rpm_version}-%{release}
Requires: dotnet-apphost-pack-3.1%{?_isa} >= %{runtime_rpm_version}-%{release}
Requires: dotnet-targeting-pack-3.1%{?_isa} >= %{runtime_rpm_version}-%{release}
Requires: aspnetcore-targeting-pack-3.1%{?_isa} >= %{aspnetcore_runtime_rpm_version}-%{release}
Requires: netstandard-targeting-pack-2.1%{?_isa} >= %{sdk_rpm_version}-%{release}
Requires: dotnet-templates-3.1%{?_isa} >= %{sdk_rpm_version}-%{release}
Requires: dotnet-templates-3.1%{?_isa} >= %{sdk_rpm_version}-%{release}
%description -n dotnet-sdk-3.1
The .NET Core SDK is a collection of command line applications to
......@@ -268,10 +269,10 @@ applications and micro-services.
%define dotnet_targeting_pack() %{expand:
%package -n %{1}
Version: %{2}
Summary: Targeting Pack for %{3} %{4}
Version: %{2}
Summary: Targeting Pack for %{3} %{4}
Requires: dotnet-host
Requires: dotnet-host
%description -n %{1}
This package provides a targetting pack for %{3} %{4}
......@@ -336,6 +337,7 @@ cat source-build-info.txt
find -iname 'nuget.config' -exec echo {}: \; -exec cat {} \; -exec echo \;
%patch501 -p3
%build
cat /etc/os-release
......@@ -451,6 +453,9 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
%dir %{_libdir}/dotnet/packs
%changelog
* Thu Apr 15 2021 Michael L. Young <elgueromexicano@gmail.com> - 3.1.113-1.rocky
- Add Rocky Runtime ID
* Tue Mar 02 2021 Omair Majid <omajid@redhat.com> - 3.1.113-1
- Update to .NET Core SDK 3.1.113 and Runtime 3.1.13
- Resolves: RHBZ#1933845
......
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