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

import dotnet3.1-3.1.119-2.el8

parent c7170364
195deb8ef1f0732ac773e9c46b7a531cc1f6d6bd SOURCES/dotnet-v3.1.120-SDK.tar.gz
f32e4c0d50bd5566b4f85a5bfa953158d7c636f3 SOURCES/dotnet-v3.1.119-SDK.tar.gz
SOURCES/dotnet-v3.1.120-SDK.tar.gz
SOURCES/dotnet-v3.1.119-SDK.tar.gz
......@@ -113,7 +113,7 @@ diff -Naurp dotnet-v3.1.120-SDK-orig/src/dotnet-corefx.c2011c5350eba4c83554205d0
+ <RuntimeGroup Include="rocky">
+ <Parent>rhel</Parent>
+ <Architectures>x64;arm64</Architectures>
+ <Versions>8.4</Versions>
+ <Versions>8</Versions>
+ </RuntimeGroup>
+
<RuntimeGroup Include="sles">
......
diff --git a/Directory.Build.props b/Directory.Build.props
index f6a6f54a..8247c3ee 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -133,8 +133,8 @@
<AspNetRazorBuildServerLogDir>$(BaseOutputPath)aspnet-debug</AspNetRazorBuildServerLogDir>
<AspNetRazorBuildServerLogFile>$(AspNetRazorBuildServerLogDir)razor-build-server.log</AspNetRazorBuildServerLogFile>
<IlasmPath Condition="'$(OfflineBuild)' != 'true'">invalid: ILAsm is not expected to be needed in the online build</IlasmPath>
- <IlasmPath Condition="'$(OfflineBuild)' == 'true'">$(PrebuiltSourceBuiltPackagesPath)coreclr-tools/$(BuildArchitecture)/ilasm</IlasmPath>
- <IldasmPath Condition="'$(OfflineBuild)' != 'true'">$(ToolPackageExtractDir)coreclr-tools/$(BuildArchitecture)/ildasm</IldasmPath>
+ <IlasmPath Condition="'$(OfflineBuild)' == 'true'">$(PrebuiltSourceBuiltPackagesPath)coreclr-tools/ilasm</IlasmPath>
+ <IldasmPath Condition="'$(OfflineBuild)' != 'true'">$(ToolPackageExtractDir)coreclr-tools/ildasm</IldasmPath>
<IldasmPath Condition="'$(OfflineBuild)' == 'true'">invalid: ILDasm is not expected to be needed in the offline build</IldasmPath>
<!-- Dir where git info is generated during online builds. -->
<GitInfoOutputDir>$(BaseOutputPath)git-info/</GitInfoOutputDir>
%bcond_with bootstrap
# Avoid provides/requires from private libraries
%global privlibs libhostfxr
%global privlibs %{privlibs}|libclrjit
......@@ -23,10 +25,10 @@
%endif
%global dotnet_ldflags %(echo %{__global_ldflags} | sed -re 's/-specs=[^ ]*//g')
%global host_version 3.1.20
%global runtime_version 3.1.20
%global host_version 3.1.19
%global runtime_version 3.1.19
%global aspnetcore_runtime_version %{runtime_version}
%global sdk_version 3.1.120
%global sdk_version 3.1.119
%global templates_version %(echo %{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
%global host_rpm_version %{host_version}
......@@ -59,7 +61,7 @@
Name: dotnet3.1
Version: %{sdk_rpm_version}
Release: 1%{?dist}.rocky.0
Release: 2%{?dist}.rocky.0
Summary: .NET Core CLI tools and runtime
License: MIT and ASL 2.0 and BSD
URL: https://github.com/dotnet/
......@@ -71,12 +73,14 @@ Source0: dotnet-v%{sdk_version}-SDK.tar.gz
Source100: check-debug-symbols.py
Source101: dotnet.sh.in
Patch1: source-build-ilasm-ildasm-path-fix.patch
Patch100: corefx-optflags-support.patch
Patch101: corefx-39633-cgroupv2-mountpoints.patch
Patch103: corefx-39633-cgroupv2-mountpoints.patch
Patch200: coreclr-27048-sysctl-deprecation.patch
Patch201: coreclr-hardening-flags.patch
Patch202: coreclr-libunwind-fno-common.patch
# Already applied at tarball build time
#Patch201: coreclr-libunwind-fno-common.patch
Patch300: core-setup-do-not-strip.patch
......@@ -88,6 +92,11 @@ ExclusiveArch: x86_64
BuildRequires: clang
BuildRequires: cmake
BuildRequires: coreutils
%if %{without bootstrap}
BuildRequires: dotnet-build-reference-packages
BuildRequires: dotnet-sdk-3.1
BuildRequires: dotnet-sdk-3.1-source-built-artifacts
%endif
BuildRequires: git
%if 0%{?fedora} || 0%{?rhel} > 7
BuildRequires: glibc-langpack-en
......@@ -287,6 +296,17 @@ applications using the .NET Core SDK.
%dotnet_targeting_pack aspnetcore-targeting-pack-3.1 %{aspnetcore_runtime_rpm_version} Microsoft.AspNetCore.App 3.1 Microsoft.AspNetCore.App.Ref
#%%dotnet_targeting_pack netstandard-targeting-pack-2.1 %%{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref
%package -n dotnet-sdk-3.1-source-built-artifacts
Version: %{sdk_rpm_version}
Summary: Internal package for building .NET Core 3.1 Software Development Kit
%description -n dotnet-sdk-3.1-source-built-artifacts
The .NET Core source-built archive is a collection of packages needed
to build the .NET Core SDK itself.
These are not meant for general use.
%prep
%ifarch x86_64
......@@ -296,28 +316,46 @@ applications using the .NET Core SDK.
%setup T -b1 -q -n dotnet-v%{sdk_version}-SDK-rhel.8-arm64
%endif
%if %{without bootstrap}
# Remove all prebuilts
find -iname '*.dll' -type f -delete
find -iname '*.so' -type f -delete
find -iname '*.tar.gz' -type f -delete
find -iname '*.nupkg' -type f -delete
find -iname '*.zip' -type f -delete
rm -rf .dotnet/
rm -rf packages/source-built
%endif
%if %{without bootstrap}
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
%endif
# Fix bad hardcoded path in build
sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/dotnet-core-setup.*/src/corehost/common/pal.unix.cpp
sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/core-setup.*/src/corehost/common/pal.unix.cpp
# Disable warnings
sed -i 's|skiptests|skiptests ignorewarnings|' repos/coreclr.common.props
pushd src/dotnet-corefx.*
%patch1 -p1
pushd src/corefx.*
%patch100 -p1
%patch101 -p1
%patch103 -p1
popd
pushd src/dotnet-coreclr.*
pushd src/coreclr.*
%patch200 -p1
%patch201 -p1
%patch202 -p1
#%%patch201 -p1
popd
pushd src/dotnet-core-setup.*
pushd src/core-setup.*
%patch300 -p1
popd
pushd src/dotnet-cli.*
pushd src/cli.*
%patch500 -p1
popd
......@@ -338,16 +376,25 @@ find -iname 'nuget.config' -exec echo {}: \; -exec cat {} \; -exec echo \;
%build
cat /etc/os-release
%if %{without bootstrap}
# We need to create a copy because we will mutate this
cp -a %{_libdir}/dotnet previously-built-dotnet
%endif
export CFLAGS="%{dotnet_cflags}"
export CXXFLAGS="%{dotnet_cflags}"
export LDFLAGS="%{dotnet_ldflags}"
VERBOSE=1 ./build.sh \
-- \
/v:n \
/p:LogVerbosity=n \
/p:MinimalConsoleLogOutput=false \
/p:ContinueOnPrebuiltBaselineError=true \
%if %{without bootstrap}
--with-sdk previously-built-dotnet \
%endif
-- \
/v:n \
/p:SkipPortableRuntimeBuild=true \
/p:LogVerbosity=n \
/p:MinimalConsoleLogOutput=false \
/p:ContinueOnPrebuiltBaselineError=true \
sed -e 's|[@]LIBDIR[@]|%{_libdir}|g' %{SOURCE101} > dotnet.sh
......@@ -355,7 +402,7 @@ sed -e 's|[@]LIBDIR[@]|%{_libdir}|g' %{SOURCE101} > dotnet.sh
%install
install -dm 0755 %{buildroot}%{_libdir}/dotnet
ls artifacts/%{runtime_arch}/Release
find artifacts/%{runtime_arch}/Release
tar xf artifacts/%{runtime_arch}/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}.tar.gz -C %{buildroot}%{_libdir}/dotnet/
# Install managed symbols
......@@ -408,6 +455,9 @@ chmod 0755 %{buildroot}/%{_libdir}/dotnet/packs/Microsoft.NETCore.App.Host.%{run
#install -dm 0755 %%{buildroot}%%{_sysconfdir}/dotnet
#install install_location %%{buildroot}%%{_sysconfdir}/dotnet/
install -dm 0755 %{buildroot}%{_libdir}/dotnet/source-built-artifacts
install artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %{buildroot}/%{_libdir}/dotnet/source-built-artifacts/
# Check debug symbols in all elf objects. This is not in %%check
# because native binaries are stripped by rpm-build after %%install.
# So we need to do this check earlier.
......@@ -448,47 +498,39 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
%{_libdir}/dotnet/sdk/%{sdk_version}
%dir %{_libdir}/dotnet/packs
%files -n dotnet-sdk-3.1-source-built-artifacts
%dir %{_libdir}/dotnet
%{_libdir}/dotnet/source-built-artifacts
%changelog
* Wed Oct 13 2021 Release Engineering <releng@rockylinux.org> - 3.1.120-1.rocky.0
* Tue Nov 09 2021 Release Engineering <releng@rockylinux.org> - 3.1.119-2.rocky.0
- Add Rocky Runtime ID with minor versions
* Thu Oct 07 2021 Omair Majid <omajid@redhat.com> - 3.1.120-1
- Update to .NET SDK 3.1.120 and Runtime 3.1.20
- Resolves: RHBZ#2011821
* Thu Sep 02 2021 Omair Majid <omajid@redhat.com> - 3.1.119-1
* Thu Sep 23 2021 Omair Majid <omajid@redhat.com> - 3.1.119-2
- Update to .NET SDK 3.1.119 and Runtime 3.1.19
- Resolves: RHBZ#2000459
- Resolves: RHBZ#2000313
* Thu Aug 05 2021 Omair Majid <omajid@redhat.com> - 3.1.118-1
* Sat Aug 14 2021 Omair Majid <omajid@redhat.com> - 3.1.118-1
- Update to .NET SDK 3.1.118 and Runtime 3.1.18
- Resolves: RHBZ#1990189
- Resolves: RHBZ#1990174
* Fri Jul 02 2021 Andrew Slice <aslice@redhat.com> - 3.1.117-1
* Wed Aug 11 2021 Omair Majid <omajid@redhat.com> - 3.1.117-1
- Update to .NET SDK 3.1.117 and Runtime 3.1.17
- Fix renaming of coreclr to dotnet-coreclr
- Remade the core-setup-hardening patch to incorporate new defaults in the cmake file.
- Resolves: RHBZ#1978407
- Resolves: RHBZ#1978389
* Thu May 27 2021 Omair Majid <omajid@redhat.com> - 3.1.116-1
* 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#1965505
- Resolves: RHBZ#1965499
- Resolves: RHBZ#1966998
* Wed Apr 28 2021 Omair Majid <omajid@redhat.com> - 3.1.115-1
* Wed Jun 02 2021 Omair Majid <omajid@redhat.com> - 3.1.115-1
- Update to .NET SDK 3.1.115 and Runtime 3.1.15
- Resolves: RHBZ#1954333
* Tue Apr 13 2021 Omair Majid <omajid@redhat.com> - 3.1.114-2
- Rebuild to tag into the correct location
- Resolves: RHBZ#1947455
* Mon Apr 12 2021 Omair Majid <omajid@redhat.com> - 3.1.114-1
- Update to .NET Core SDK 3.1.114 and Runtime 3.1.14
- Resolves: RHBZ#1947455
- Resolves: RHBZ#1954324
* Tue Mar 09 2021 Omair Majid <omajid@redhat.com> - 3.1.113-2
- Update to .NET Core SDK 3.1.113 and Runtime 3.1.13
- Resolves: RHBZ#1933376
* Thu Apr 22 2021 Omair Majid <omajid@redhat.com> - 3.1.114-2
- Update to .NET SDK 3.1.114 and Runtime 3.1.14
- Add dotnet-sdk-3.1-source-built-artifacts subpackage
- Resolves: RHBZ#1946721
* Wed Feb 10 2021 Omair Majid <omajid@redhat.com> - 3.1.112-2
- Update to .NET Core SDK 3.1.112 and Runtime 3.1.12
......
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