@ -1,5 +1,4 @@
# CentOS Koji doesn't understand %%bootstrap
%bcond_with bootstrap_dotnet
%bcond_with bootstrap
# Avoid provides/requires from private libraries
%global privlibs libhostfxr
@ -21,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.21
%global runtime_version 6.0.21
%global host_version 6.0.22
%global runtime_version 6.0.22
%global aspnetcore_runtime_version %{runtime_version}
%global sdk_version 6.0.121
%global sdk_version 6.0.122
%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 }')
@ -61,20 +60,19 @@
Name: dotnet6.0
Version: %{sdk_rpm_version}
Release: 4 %{?dist}
Release: 1 %{?dist}
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_dotnet}
%global bootstrap_sdk_version 6.0.120
%if %{with bootstrap}
# 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-prebuilts-%{bootstrap_sdk_version}-arm64 .tar.gz
Source1: dotnet-arm64-prebuilts-2021-10-29 .tar.gz
# Generated manually, same pattern as the arm64 tarball
Source2: dotnet-prebuilts-%{bootstrap_sdk_version}-s390x .tar.gz
Source2: dotnet-s390x-prebuilts-2021-10-29 .tar.gz
%else
# The source is generated on a RHEL box via:
# ./build-dotnet-tarball %%{upstream_tag}
@ -87,7 +85,7 @@ Source11: dotnet.sh.in
# Fix using lld on RHEL
Patch100: runtime-arm64-lld-fix.patch
# Mono still has a dependency on (now unbuildable) ILStrip which was removed from CoreCLR: https://github.com/dotnet/runtime/pull/60315
# Mono still has a dependency on (now unbuildable) ILStrip which was removed from CoreCLR: https://github.com/dotnet/runtime/pull/60315
Patch101: runtime-mono-remove-ilstrip.patch
# Disable apphost, needed for s390x
@ -124,7 +122,7 @@ ExclusiveArch: x86_64
BuildRequires: clang
BuildRequires: cmake
BuildRequires: coreutils
%if %{without bootstrap_dotnet }
%if %{without bootstrap}
BuildRequires: dotnet-sdk-6.0
BuildRequires: dotnet-sdk-6.0-source-built-artifacts
%endif
@ -350,7 +348,7 @@ These are not meant for general use.
%prep
%if %{without bootstrap_dotnet }
%if %{without bootstrap}
%setup -q -n dotnet-%{upstream_tag}
%else
@ -370,28 +368,11 @@ 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_dotnet}
%if %{without bootstrap}
# Remove all prebuilts
find -iname '*.dll' -type f -delete
find -iname '*.so' -type f -delete
@ -457,7 +438,7 @@ sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_L
%build
cat /etc/os-release
%if %{without bootstrap_dotnet }
%if %{without bootstrap}
# We need to create a copy because we will mutate this
cp -a %{_libdir}/dotnet previously-built-dotnet
%endif
@ -499,7 +480,7 @@ export EXTRA_CXXFLAGS="$CXXFLAGS"
export EXTRA_LDFLAGS="$LDFLAGS"
VERBOSE=1 ./build.sh \
%if %{without bootstrap_dotnet }
%if %{without bootstrap}
--with-sdk previously-built-dotnet \
%endif
-- \
@ -631,25 +612,37 @@ rm -rf %{buildroot}%{_libdir}/dotnet/packs/NETStandard.Library.Ref/2.1.0
%changelog
* Thu Aug 24 2023 Omair Majid <omajid@redhat.com> - 6.0.121-4
- Disable bootstrap
- Related: RHBZ#2228566
* Fri Sep 01 2023 Omair Majid <omajid@redhat.com> - 6.0.122-1
- Update to .NET SDK 6.0.122 and Runtime 6.0.22
- Resolves: RHEL-2012
* 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
* Wed Aug 02 2023 Omair Majid <omajid@redhat.com> - 6.0.121-1
- Update to .NET SDK 6.0.121 and Runtime 6.0.21
- Resolves: RHBZ#2228566
- Resolves: RHBZ#2228568
* Tue Jul 11 2023 Omair Majid <omajid@redhat.com> - 6.0.120-2
* Tue Jul 04 2023 Omair Majid <omajid@redhat.com> - 6.0.120-1
- Update to .NET SDK 6.0.120 and Runtime 6.0.20
- Resolves: RHBZ#2219636
- Resolves: RHBZ#2219639
* Thu Jul 06 2023 Omair Majid <omajid@redhat.com> - 6.0.119-2
* Tue Jun 20 2023 Omair Majid <omajid@redhat.com> - 6.0.119-1
- Update to .NET SDK 6.0.119 and Runtime 6.0.19
- Resolves: RHBZ#2216218
- Resolves: RHBZ#2216221
* Thu Jun 01 2023 Andrew Slice <andrew.slice@redhat.com> - 6.0.118-1
- Update to .NET SDK 6.0.118 and Runtime 6.0.18
- Resolves: RHBZ#2212378
* Thu May 04 2023 Omair Majid <omajid@redhat.com> - 6.0.117-2
- Update to .NET SDK 6.0.117 and Runtime 6.0.17
- Resolves: RHBZ#2190262
* 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#2183580
* 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#2174980
* 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
MSVSphere Packaging Team
9 months ago