Compare commits

...

No commits in common. 'c9' and 'c8' have entirely different histories.
c9 ... c8

@ -1 +1 @@
2afbea98a8b143f8605fcd1839160ffb3b8401eb SOURCES/dotnet-v6.0.135.tar.gz
df9dbde06f514e0602023b338bdcf03712cdf7ef SOURCES/dotnet-v6.0.135.tar.gz

@ -65,7 +65,7 @@ def scan_file(file):
def is_elf(file):
result = subprocess.run(['file', file], stdout=subprocess.PIPE, encoding='utf-8', check=True)
return re.search('ELF 64-bit LSB (?:pie )(?:executable|shared object)', result.stdout)
return re.search(r'ELF 64-bit [LM]SB (?:pie )?(?:executable|shared object)', result.stdout)
def scan_file_if_sensible(file):
if is_elf(file):

@ -1,4 +1,5 @@
%bcond_with bootstrap
# CentOS Koji doesn't understand %%bootstrap
%bcond_with bootstrap_dotnet
# Avoid provides/requires from private libraries
%global privlibs libhostfxr
@ -65,20 +66,22 @@ Summary: .NET 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/
%if %{with bootstrap}
%if %{with bootstrap_dotnet}
%global bootstrap_sdk_version 6.0.120
# The source is generated on a RHEL box via:
# ./build-dotnet-tarball --bootstrap %%{upstream_tag}
Source0: dotnet-%{upstream_tag}-x64-bootstrap.tar.xz
# Generated via ./build-arm64-bootstrap-tarball
Source1: dotnet-arm64-prebuilts-2021-10-29.tar.gz
Source1: dotnet-prebuilts-%{bootstrap_sdk_version}-arm64.tar.gz
# Generated manually, same pattern as the arm64 tarball
Source2: dotnet-s390x-prebuilts-2021-10-29.tar.gz
Source2: dotnet-prebuilts-%{bootstrap_sdk_version}-s390x.tar.gz
%else
# The source is generated on a RHEL box via:
# ./build-dotnet-tarball %%{upstream_tag}
Source0: dotnet-%{upstream_tag}.tar.gz
%endif
Source10: check-debug-symbols.py
Source11: dotnet.sh.in
@ -114,18 +117,16 @@ Patch1001: msbuild-no-systemconfiguration.patch
Patch1500: sdk-telemetry-optout.patch
%if 0%{?fedora} || 0%{?rhel} >= 8
ExclusiveArch: aarch64 x86_64 s390x
%else
ExclusiveArch: x86_64
%endif
BuildRequires: clang
BuildRequires: cmake
BuildRequires: coreutils
%if %{without bootstrap}
%if %{without bootstrap_dotnet}
BuildRequires: dotnet-sdk-6.0
BuildRequires: dotnet-sdk-6.0-source-built-artifacts
%endif
@ -164,6 +165,25 @@ framework libraries, an SDK containing compilers and a 'dotnet'
application to drive everything.
%package -n dotnet
Version: %{sdk_rpm_version}
Summary: .NET CLI tools and runtime
Requires: dotnet-sdk-6.0%{?_isa} >= %{sdk_rpm_version}-%{release}
%description -n dotnet
.NET is a fast, lightweight and modular platform for creating
cross platform applications that work on Linux, macOS and Windows.
It particularly focuses on creating console applications, web
applications and micro-services.
.NET contains a runtime conforming to .NET Standards a set of
framework libraries, an SDK containing compilers and a 'dotnet'
application to drive everything.
%package -n dotnet-host
Version: %{host_rpm_version}
@ -213,7 +233,7 @@ Requires: libicu%{?_isa}
# See src/runtime/src/libraries/Native/AnyOS/brotli-version.txt
Provides: bundled(libbrotli) = 1.0.9
%if %{use_bundled_libunwind}
# See src/runtime/src/coreclr/pal/src/libunwind/libunwind-version.txt
# See runtime/src/coreclr/pal/src/libunwind/libunwind-version.txt
Provides: bundled(libunwind) = 1.5.rc1.28.g9165d2a1
%endif
@ -332,7 +352,7 @@ These are not meant for general use.
%prep
%if %{without bootstrap}
%if %{without bootstrap_dotnet}
%setup -q -n dotnet-%{upstream_tag}
%else
@ -352,11 +372,28 @@ tar xf packages/prebuilt/dotnet-sdk*.tar.gz -C .dotnet/
rm packages/prebuilt/dotnet-sdk*.tar.gz
boot_sdk_version=$(ls -1 .dotnet/sdk/)
sed -i -E 's|"dotnet": "[^"]+"|"dotnet" : "'$boot_sdk_version'"|' global.json
%ifarch ppc64le s390x
ilasm_version=$(ls packages/prebuilt| grep -i ilasm | tr 'A-Z' 'a-z' | sed -E 's|runtime.linux-'%{runtime_arch}'.microsoft.netcore.ilasm.||' | sed -E 's|.nupkg$||')
echo $ilasm_version
mkdir -p packages-customized-local
pushd packages-customized-local
tar xf ../packages/archive/Private.SourceBuilt.Artifacts.*.tar.gz
sed -i -E 's|<MicrosoftNETCoreILAsmVersion>[^<]+</MicrosoftNETCoreILAsmVersion>|<MicrosoftNETCoreILAsmVersion>'$ilasm_version'</MicrosoftNETCoreILAsmVersion>|' PackageVersions.props
sed -i -E 's|<MicrosoftNETCoreILAsmPackageVersion>[^<]+</MicrosoftNETCoreILAsmPackageVersion>|<MicrosoftNETCoreILAsmPackageVersion>'$ilasm_version'</MicrosoftNETCoreILAsmPackageVersion>|' PackageVersions.props
sed -i -E 's|<MicrosoftNETCoreILDAsmVersion>[^<]+</MicrosoftNETCoreILDAsmVersion>|<MicrosoftNETCoreILDAsmVersion>'$ilasm_version'</MicrosoftNETCoreILDAsmVersion>|' PackageVersions.props
sed -i -E 's|<MicrosoftNETCoreILDAsmPackageVersion>[^<]+</MicrosoftNETCoreILDAsmPackageVersion>|<MicrosoftNETCoreILDAsmPackageVersion>'$ilasm_version'</MicrosoftNETCoreILDAsmPackageVersion>|' PackageVersions.props
tar czf ../packages/archive/Private.SourceBuilt.Artifacts.*.tar.gz *
popd
%endif
%endif
%endif
%if %{without bootstrap}
%if %{without bootstrap_dotnet}
# Remove all prebuilts
find -iname '*.dll' -type f -delete
find -iname '*.so' -type f -delete
@ -415,6 +452,7 @@ popd
pushd src/installer
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
%endif
@ -422,7 +460,7 @@ sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_L
%build
cat /etc/os-release
%if %{without bootstrap}
%if %{without bootstrap_dotnet}
# We need to create a copy because we will mutate this
cp -a %{_libdir}/dotnet previously-built-dotnet
%endif
@ -463,21 +501,8 @@ export EXTRA_CFLAGS="$CFLAGS"
export EXTRA_CXXFLAGS="$CXXFLAGS"
export EXTRA_LDFLAGS="$LDFLAGS"
# Disable tracing, which is incompatible with certain versions of
# lttng See https://github.com/dotnet/runtime/issues/57784. The
# suggested compile-time change doesn't work, unfrotunately.
export COMPlus_LTTng=0
%if 0%{?rhel} > 8
# OpenSSL 3.0 in RHEL 9 has disabled SHA1, used by .NET for strong
# name signing. See https://github.com/dotnet/runtime/issues/67304
# https://gitlab.com/redhat/centos-stream/rpms/openssl/-/commit/78fb78d30755ae18fdaef28ef392f4e67c662ff6
export OPENSSL_ENABLE_SHA1_SIGNATURES=1
%endif
CheckEolTargetFramework=false VERBOSE=1 timeout 6h \
./build.sh \
%if %{without bootstrap}
VERBOSE=1 ./build.sh \
%if %{without bootstrap_dotnet}
--with-sdk previously-built-dotnet \
%endif
-- \
@ -499,13 +524,12 @@ 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 -name 'testhost.x86' -delete
find %{buildroot}%{_libdir}/dotnet/ -type f -name 'vstest.console' -delete
find %{buildroot}%{_libdir}/dotnet/ -type f -iname testhost.x86 -delete
find %{buildroot}%{_libdir}/dotnet/ -type f -iname vstest.console -delete
# 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 \
# Install managed symbols
# Disabled until https://github.com/dotnet/source-build/issues/2623 is sorted out
# tar xf artifacts/%%{runtime_arch}/Release/runtime/dotnet-runtime-symbols-*%%{runtime_version}*.tar.gz \
# -C %%{buildroot}/%%{_libdir}/dotnet/shared/Microsoft.NETCore.App/%%{runtime_version}/
# Fix executable permissions on files
@ -564,12 +588,8 @@ test -f %{buildroot}%{_libdir}/dotnet/sdk/%{sdk_version}/Sdks/Microsoft.NET.Sdk/
echo "Testing build results for debug symbols..."
%{SOURCE10} -v %{buildroot}%{_libdir}/dotnet/
# Self-check
%if 0%{?fedora} > 35
# lttng in Fedora > 35 is incompatible with .NET
export COMPlus_LTTng=0
%endif
# Self-check
%{buildroot}%{_libdir}/dotnet/dotnet --info
%{buildroot}%{_libdir}/dotnet/dotnet --version
@ -581,6 +601,7 @@ rm %{buildroot}%{_libdir}/dotnet/dotnet
# Provided by netstandard-targeting-pack-2.1 from another SRPM
rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
%files -n dotnet-hostfxr-6.0
%dir %{_libdir}/dotnet/host/fxr
%{_libdir}/dotnet/host/fxr/%{host_version}
@ -615,147 +636,135 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
%changelog
* Sat Sep 28 2024 Omair Majid <omajid@redhat.com> - 6.0.135-1
- Update to .NET SDK 6.0.135 and Runtime 6.0.35
- Resolves: RHEL-60798
* Thu Aug 29 2024 Omair Majid <omajid@redhat.com> - 6.0.134-1
- Update to .NET SDK 6.0.134 and Runtime 6.0.34
- Resolves: RHEL-56683
- Resolves: RHEL-60792
* Thu Aug 01 2024 Omair Majid <omajid@redhat.com> - 6.0.133-1
* Wed Aug 14 2024 Omair Majid <omajid@redhat.com> - 6.0.133-2
- Update to .NET SDK 6.0.133 and Runtime 6.0.33
- Resolves: RHEL-52386
- Resolves: RHEL-52384
* Thu Jun 27 2024 Omair Majid <omajid@redhat.com> - 6.0.132-1
* Tue Jul 09 2024 Omair Majid <omajid@redhat.com> - 6.0.132-2
- Update to .NET SDK 6.0.132 and Runtime 6.0.32
- Resolves: RHEL-45321
* Mon May 06 2024 Omair Majid <omajid@redhat.com> - 6.0.130-1
- Update to .NET SDK 6.0.130 and Runtime 6.0.30
- Resolves: RHEL-35310
- Resolves: RHEL-45319
* Tue Apr 09 2024 Omair Majid <omajid@redhat.com> - 6.0.129-2
- Update to .NET SDK 6.0.129 and Runtime 6.0.29
- Resolves: RHEL-31198
- Resolves: RHEL-31194
* Tue Mar 19 2024 Omair Majid <omajid@redhat.com> - 6.0.128-2
- Update to .NET SDK 6.0.128 and Runtime 6.0.28
- Resolves: RHEL-27541
- Resolves: RHEL-27539
* Wed Feb 14 2024 Omair Majid <omajid@redhat.com> - 6.0.127-2
- Update to .NET SDK 6.0.127 and Runtime 6.0.27
- Resolves: RHEL-23785
- Resolves: RHEL-23784
* Mon Jan 15 2024 Omair Majid <omajid@redhat.com> - 6.0.126-2
- Update to .NET SDK 6.0.126 and Runtime 6.0.26
- Resolves: RHEL-19801
- Resolves: RHEL-19798
* Mon Dec 11 2023 Omair Majid <omajid@redhat.com> - 6.0.125-2
- Update to .NET SDK 6.0.125 and Runtime 6.0.25
- Resolves: RHEL-15349
- Resolves: RHEL-15348
* Tue Oct 24 2023 Omair Majid <omajid@redhat.com> - 6.0.124-2
- Update to .NET SDK 6.0.124 and Runtime 6.0.24
- Resolves: RHEL-14462
- Resolves: RHEL-14466
* Mon Oct 16 2023 Omair Majid <omajid@redhat.com> - 6.0.123-2
- Update to .NET SDK 6.0.123 and Runtime 6.0.23
- Resolves: RHEL-11689
- Resolves: RHEL-11696
* Tue Sep 12 2023 Omair Majid <omajid@redhat.com> - 6.0.122-2
- Update to .NET SDK 6.0.122 and Runtime 6.0.22
- Resolves: RHEL-1997
- Resolves: RHEL-1996
* Thu Aug 24 2023 Omair Majid <omajid@redhat.com> - 6.0.121-4
- Disable bootstrap
- Related: RHBZ#2228566
* Wed Aug 23 2023 Omair Majid <omajid@redhat.com> - 6.0.121-3
- Rebootstrap
- Related: RHBZ#2228566
* Wed Aug 09 2023 Omair Majid <omajid@redhat.com> - 6.0.121-2
- Update to .NET SDK 6.0.121 and Runtime 6.0.21
- Resolves: RHBZ#2228567
- Resolves: RHBZ#2228566
* Tue Jul 11 2023 Omair Majid <omajid@redhat.com> - 6.0.120-2
- Update to .NET SDK 6.0.120 and Runtime 6.0.20
- Resolves: RHBZ#2219637
* Tue Jun 13 2023 Andrew Slice <andrew.slice@redhat.com> - 6.0.118-2
- Update to .NET SDK 6.0.118 and Runtime 6.0.18
- Resolves: RHBZ#2211719
- Resolves: RHBZ#2219636
* Wed Apr 12 2023 Omair Majid <omajid@redhat.com> - 6.0.116-2
- Update to .NET SDK 6.0.116 and Runtime 6.0.16
- Resolves: RHBZ#2183582
* Wed Mar 15 2023 Omair Majid <omajid@redhat.com> - 6.0.115-2
- Update to .NET SDK 6.0.115 and Runtime 6.0.15
- Resolves: RHBZ#2174981
* Thu Jul 06 2023 Omair Majid <omajid@redhat.com> - 6.0.119-2
- Update to .NET SDK 6.0.119 and Runtime 6.0.19
- Resolves: RHBZ#2216218
* Thu Feb 16 2023 Omair Majid <omajid@redhat.com> - 6.0.114-2
- Update to .NET SDK 6.0.114 and Runtime 6.0.14
- Resolves: RHBZ#2166767
- Resolves: RHBZ#2166765
* Wed Jan 11 2023 Omair Majid <omajid@redhat.com> - 6.0.113-2
- Update to .NET SDK 6.0.113 and Runtime 6.0.13
- Resolves: RHBZ#2154457
- Resolves: RHBZ#2154456
* Wed Dec 14 2022 Omair Majid <omajid@redhat.com> - 6.0.112-2
- Update to .NET SDK 6.0.112 and Runtime 6.0.12
- Resolves: RHBZ#2150146
* Wed Nov 09 2022 Omair Majid <omajid@redhat.com> - 6.0.111-1
- Update to .NET SDK 6.0.111 and Runtime 6.0.11
- Resolves: RHBZ#2138278
- Resolves: RHBZ#2150145
* Tue Nov 08 2022 Omair Majid <omajid@redhat.com> - 6.0.110-2
- Fix build with newer versions of clang
- Related: RHBZ#2131326
* Fri Nov 18 2022 Omair Majid <omajid@redhat.com> - 6.0.111-3
- Disable subpackages provided by another SRPM
- Related: RHBZ#2138275
* Fri Oct 28 2022 Omair Majid <omajid@redhat.com> - 6.0.110-1
- Update to .NET SDK 6.0.110 and Runtime 6.0.10
- Resolves: RHBZ#2131326
* Tue Sep 20 2022 Omair Majid <omajid@redhat.com> - 6.0.109-3
- Disable packages now produced by another SRPM
- Related: RHBZ#2123788
* Wed Sep 14 2022 Omair Majid <omajid@redhat.com> - 6.0.109-2
- Update to .NET SDK 6.0.109 and Runtime 6.0.9
- Resolves: RHBZ#2123788
* Wed Nov 16 2022 Omair Majid <omajid@redhat.com> - 6.0.111-2
- Update to .NET SDK 6.0.111 and Runtime 6.0.11
- Resolves: RHBZ#2138275
* Tue Aug 09 2022 Omair Majid <omajid@redhat.com> - 6.0.108-1
- Update to .NET SDK 6.0.108 and Runtime 6.0.8
- Resolves: RHBZ#2112409
- Resolves: RHBZ#2112408
* Thu Jul 21 2022 Omair Majid <omajid@redhat.com> - 6.0.107-2
- Update to .NET SDK 6.0.107 and Runtime 6.0.7
- Resolves: RHBZ#2103269
- Resolves: RHBZ#2103268
* Thu Jun 23 2022 Omair Majid <omajid@redhat.com> - 6.0.106-1
- Update to .NET SDK 6.0.106 and Runtime 6.0.6
- Resolves: RHBZ#2093431
- Resolves: RHBZ#2093430
* Wed May 25 2022 Omair Majid <omajid@redhat.com> - 6.0.105-1
* Mon May 16 2022 Omair Majid <omajid@redhat.com> - 6.0.105-1
- Update to .NET SDK 6.0.105 and Runtime 6.0.5
- Resolves: RHBZ#2082266
- Resolves: RHBZ#2082265
* Sat Apr 30 2022 Omair Majid <omajid@redhat.com> - 6.0.104-1
* Mon Apr 25 2022 Omair Majid <omajid@redhat.com> - 6.0.104-3
- Update to .NET SDK 6.0.104 and Runtime 6.0.4
- Resolves: RHBZ#2078604
- Resolves: RHBZ#2072006
* Mon Apr 25 2022 Omair Majid <omajid@redhat.com> - 6.0.103-2
- Update to .NET SDK 6.0.103 and Runtime 6.0.3
- Resolves: RHBZ#2072015
* Thu Feb 17 2022 Omair Majid <omajid@redhat.com> - 6.0.102-1
- Update to .NET SDK 6.0.102 and Runtime 6.0.2
- Resolves: RHBZ#2030390
- Resolves: RHBZ#2048256
* Tue Feb 15 2022 Omair Majid <omajid@redhat.com> - 6.0.102-3
- Disable bootstrap
- Related: RHBZ#1986211
* Fri Dec 10 2021 Omair Majid <omajid@redhat.com> - 6.0.100-1
- Fix build against clang 13
- Resolves: RHBZ#2003061
- Resolves: RHBZ#2015536
- Resolves: RHBZ#2014666
* Fri Feb 04 2022 Omair Majid <omajid@redhat.com> - 6.0.100-2
- Rebuild and check SDK to avoid an incomplete SDK
- Related: RHBZ#1986211
* Sun Oct 31 2021 Omair Majid <omajid@redhat.com> - 6.0.100-0.10
- Disable bootstrap
- Related: RHBZ#2016373
* Wed Nov 10 2021 Omair Majid <omajid@redhat.com> - 6.0.100-1
- Update to .NET 6
- Resolves: RHBZ#1986211
* Sat Oct 30 2021 Omair Majid <omajid@redhat.com> - 6.0.100-0.9
- Fix msbuild to run on s390x
- Related: RHBZ#2016373
* Fri Oct 22 2021 Omair Majid <omajid@redhat.com> - 6.0.0-0.7.rc2
- Update to .NET 6 RC2
* Thu Oct 28 2021 Omair Majid <omajid@redhat.com> - 6.0.100-0.8
- Update to .NET SDK 6.0.100 and Runtime 6.0.0
- Related: RHBZ#2016373
* Wed Oct 27 2021 Adam Kimball <akimball@redhat.com> - 6.0.0-0.7.rc2
- Update to .NET SDK 6.0.100-rc.2 and Runtime 6.0.0-rc.2
- Resolves: RHBZ#2016373
* Fri Oct 08 2021 Omair Majid <omajid@redhat.com> - 6.0.0-0.6.28be3e9a006d90d8c6e87d4353b77882829df718
- Enable building on arm64
- Related: RHBZ#1986017

Loading…
Cancel
Save