import dotnet6.0-6.0.105-1.el9_0
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
30792dc5ca
commit
7eac2d8a09
|
|
@ -1 +1 @@
|
|||
fabf7d61080026082feb263ff7cb6bf5d110cb89 SOURCES/dotnet-v6.0.103-SDK.tar.gz
|
||||
4ef36890d6f675adfa0e9a80e263751555d88f38 SOURCES/dotnet-v6.0.105.tar.gz
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
SOURCES/dotnet-v6.0.103-SDK.tar.gz
|
||||
SOURCES/dotnet-v6.0.105.tar.gz
|
||||
|
|
|
|||
|
|
@ -20,10 +20,10 @@
|
|||
# until that's done, disable LTO. This has to happen before setting the flags below.
|
||||
%define _lto_cflags %{nil}
|
||||
|
||||
%global host_version 6.0.3
|
||||
%global runtime_version 6.0.3
|
||||
%global host_version 6.0.5
|
||||
%global runtime_version 6.0.5
|
||||
%global aspnetcore_runtime_version %{runtime_version}
|
||||
%global sdk_version 6.0.103
|
||||
%global sdk_version 6.0.105
|
||||
%global sdk_feature_band_version %(echo %{sdk_version} | sed -e 's|[[:digit:]][[:digit:]]$|00|')
|
||||
%global templates_version %{runtime_version}
|
||||
#%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }')
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
%global sdk_rpm_version %{sdk_version}
|
||||
|
||||
# upstream can update releases without revving the SDK version so these don't always match
|
||||
%global upstream_tag v%{sdk_version}-SDK
|
||||
%global upstream_tag v%{sdk_version}
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} < 8
|
||||
%global use_bundled_libunwind 0
|
||||
|
|
@ -118,12 +118,14 @@ Patch1501: sdk-22373-portablerid.patch
|
|||
# https://github.com/dotnet/installer/pull/12516
|
||||
Patch1600: installer-12516-portablerid.patch
|
||||
|
||||
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 8
|
||||
ExclusiveArch: aarch64 x86_64 s390x
|
||||
%else
|
||||
ExclusiveArch: x86_64
|
||||
%endif
|
||||
|
||||
|
||||
BuildRequires: clang
|
||||
BuildRequires: cmake
|
||||
BuildRequires: coreutils
|
||||
|
|
@ -212,10 +214,10 @@ Requires: dotnet-hostfxr-6.0%{?_isa} >= %{host_rpm_version}-%{release}
|
|||
# libicu is dlopen()ed
|
||||
Requires: libicu%{?_isa}
|
||||
|
||||
# See src/runtime.*/src/libraries/Native/AnyOS/brotli-version.txt
|
||||
# See src/runtime/src/libraries/Native/AnyOS/brotli-version.txt
|
||||
Provides: bundled(libbrotli) = 1.0.9
|
||||
%if %{use_bundled_libunwind}
|
||||
# See runtime.*/src/coreclr/pal/src/libunwind/libunwind-version.txt
|
||||
# See src/runtime/src/coreclr/pal/src/libunwind/libunwind-version.txt
|
||||
Provides: bundled(libunwind) = 1.5.rc1.28.g9165d2a1
|
||||
%endif
|
||||
|
||||
|
|
@ -374,32 +376,32 @@ ln -s %{_libdir}/dotnet/reference-packages/Private.SourceBuild.ReferencePackages
|
|||
%endif
|
||||
|
||||
# Fix bad hardcoded path in build
|
||||
sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime.*/src/native/corehost/hostmisc/pal.unix.cpp
|
||||
sed -i 's|/usr/share/dotnet|%{_libdir}/dotnet|' src/runtime/src/native/corehost/hostmisc/pal.unix.cpp
|
||||
|
||||
pushd src/runtime.*
|
||||
pushd src/runtime
|
||||
%patch100 -p1
|
||||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
popd
|
||||
|
||||
pushd src/fsharp.*
|
||||
pushd src/fsharp
|
||||
%patch500 -p1
|
||||
popd
|
||||
|
||||
pushd src/arcade.*
|
||||
pushd src/arcade
|
||||
%patch700 -p1
|
||||
popd
|
||||
|
||||
pushd src/roslyn.*
|
||||
pushd src/roslyn
|
||||
%patch800 -p3
|
||||
%patch801 -p1
|
||||
popd
|
||||
|
||||
pushd src/roslyn-analyzers.*
|
||||
pushd src/roslyn-analyzers
|
||||
%patch900 -p1
|
||||
popd
|
||||
|
||||
pushd src/msbuild.*
|
||||
pushd src/msbuild
|
||||
|
||||
# These are mono-specific fixes. Mono is only used on s390x. Restrict
|
||||
# patch to s390x to avoid potential risk in other architectures.
|
||||
|
|
@ -410,17 +412,17 @@ pushd src/msbuild.*
|
|||
|
||||
popd
|
||||
|
||||
pushd src/sdk.*
|
||||
pushd src/sdk
|
||||
%patch1500 -p1
|
||||
%patch1501 -p1
|
||||
popd
|
||||
|
||||
pushd src/installer.*
|
||||
pushd src/installer
|
||||
%patch1600 -p1
|
||||
popd
|
||||
|
||||
%if ! %{use_bundled_libunwind}
|
||||
sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime.*/eng/SourceBuild.props
|
||||
sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime/eng/SourceBuild.props
|
||||
%endif
|
||||
|
||||
%build
|
||||
|
|
@ -502,11 +504,13 @@ ls artifacts/%{runtime_arch}/Release
|
|||
tar xf artifacts/%{runtime_arch}/Release/dotnet-sdk-%{sdk_version}-%{runtime_id}.tar.gz -C %{buildroot}%{_libdir}/dotnet/
|
||||
|
||||
# See https://github.com/dotnet/source-build/issues/2579
|
||||
find %{buildroot}%{_libdir}/dotnet/ -type f -iname testhost.x86 -delete
|
||||
find %{buildroot}%{_libdir}/dotnet/ -type f -iname vstest.console -delete
|
||||
find %{buildroot}%{_libdir}/dotnet/ -type f -name 'testhost.x86' -delete
|
||||
find %{buildroot}%{_libdir}/dotnet/ -type f -name 'vstest.console' -delete
|
||||
|
||||
# Install managed symbols
|
||||
# Disabled until https://github.com/dotnet/source-build/issues/2623 is sorted out
|
||||
# Install managed symbols: disabled because they don't contain sources
|
||||
# but point to the paths the sources would have been at in the build
|
||||
# servers. The end user experience is pretty bad atm.
|
||||
# tar xf artifacts/%%{runtime_arch}/Release/runtime/dotnet-runtime-symbols-%%{runtime_id}-%%{runtime_version}.tar.gz \
|
||||
# -C %%{buildroot}/%%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%%{runtime_version}/
|
||||
|
||||
|
|
@ -530,7 +534,7 @@ install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/
|
|||
|
||||
install -dm 0755 %{buildroot}/%{_datadir}/bash-completion/completions
|
||||
# dynamic completion needs the file to be named the same as the base command
|
||||
install src/sdk.*/scripts/register-completions.bash %{buildroot}/%{_datadir}/bash-completion/completions/dotnet
|
||||
install src/sdk/scripts/register-completions.bash %{buildroot}/%{_datadir}/bash-completion/completions/dotnet
|
||||
|
||||
# TODO: the zsh completion script needs to be ported to use #compdef
|
||||
#install -dm 755 %%{buildroot}/%%{_datadir}/zsh/site-functions
|
||||
|
|
@ -619,6 +623,14 @@ export COMPlus_LTTng=0
|
|||
|
||||
|
||||
%changelog
|
||||
* Mon May 09 2022 Omair Majid <omajid@redhat.com> - 6.0.105-1
|
||||
- Update to .NET SDK 6.0.105 and Runtime 6.0.5
|
||||
- Resolves: RHBZ#2082268
|
||||
|
||||
* Tue May 03 2022 Omair Majid <omajid@redhat.com> - 6.0.104-1
|
||||
- Update to .NET SDK 6.0.104 and Runtime 6.0.4
|
||||
- Resolves: RHBZ#2080460
|
||||
|
||||
* Mon Apr 04 2022 Omair Majid <omajid@redhat.com> - 6.0.103-1
|
||||
- Update to .NET SDK 6.0.103 and Runtime 6.0.3
|
||||
- Sync with RHEL 8
|
||||
|
|
|
|||
Loading…
Reference in New Issue