Re-bootstrap
Related: RHBZ#2228570
This commit is contained in:
Omair Majid
parent
da2cd14bd8
commit
01e30c0366
4
.gitignore
vendored
4
.gitignore
vendored
@ -11,3 +11,7 @@
|
||||
/dotnet-v7.0.108.tar.gz
|
||||
/dotnet-v7.0.109.tar.gz
|
||||
/dotnet-v7.0.110.tar.gz
|
||||
/dotnet-v7.0.110-x64-bootstrap.tar.xz
|
||||
/dotnet-prebuilts-7.0.109-arm64.tar.gz
|
||||
/dotnet-prebuilts-7.0.109-ppc64le.tar.gz
|
||||
/dotnet-prebuilts-7.0.109-s390x.tar.gz
|
||||
|
||||
@ -17,17 +17,15 @@ function parse-nuget-name-version-from-file() {
|
||||
|
||||
bootstrap_dir=$(readlink -f "$1")
|
||||
|
||||
version=${2:-$(jq -r '.tools.dotnet' "$bootstrap_dir"/global.json)}
|
||||
sdk_version=${2:-$(jq -r '.tools.dotnet' "$bootstrap_dir"/global.json)}
|
||||
|
||||
date=$(date +%F)
|
||||
mkdir -p "dotnet-prebuilts-${sdk_version}-arm64"
|
||||
|
||||
mkdir -p "dotnet-arm64-prebuilts-$date"
|
||||
|
||||
pushd "dotnet-arm64-prebuilts-$date"
|
||||
pushd "dotnet-prebuilts-${sdk_version}-arm64"
|
||||
|
||||
# Binaries can be at one of several different URLs:
|
||||
wget https://dotnetcli.azureedge.net/dotnet/Sdk/$version/dotnet-sdk-$version-linux-arm64.tar.gz
|
||||
#wget https://dotnetbuilds.azureedge.net/public/Sdk/$version/dotnet-sdk-$version-linux-arm64.tar.gz
|
||||
wget "https://dotnetcli.azureedge.net/dotnet/Sdk/${sdk_version}/dotnet-sdk-${sdk_version}-linux-arm64.tar.gz"
|
||||
#wget "https://dotnetbuilds.azureedge.net/public/Sdk/$version/dotnet-sdk-${sdk_version}-linux-arm64.tar.gz"
|
||||
|
||||
for archive in "$bootstrap_dir"/packages/archive/*.tar.gz; do
|
||||
mapfile -t linux_x64_packages < <(tar tf "$archive" | grep linux-x64)
|
||||
@ -48,21 +46,21 @@ for archive in "$bootstrap_dir"/packages/archive/*.tar.gz; do
|
||||
done
|
||||
|
||||
# For arm64, we have forced a newer 7.0 SDK, which needs newer bits
|
||||
nappo download microsoft.windowsdesktop.app.ref 6.0.9
|
||||
nappo download microsoft.netcore.app.host.linux-arm64 6.0.9
|
||||
nappo download microsoft.netcore.app.ref 6.0.9
|
||||
nappo download microsoft.aspnetcore.app.ref 6.0.9
|
||||
|
||||
nappo download Microsoft.AspNetCore.App.Runtime.linux-arm64 7.0.0-rc.1.22427.2
|
||||
nappo download Microsoft.NETCore.App.Host.linux-arm64 7.0.0-rc.1.22426.10
|
||||
nappo download Microsoft.NETCore.App.Runtime.linux-arm64 7.0.0-rc.1.22426.10
|
||||
nappo download runtime.linux-arm64.Microsoft.NETCore.DotNetHost 7.0.0-rc.1.22426.10
|
||||
nappo download runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy 7.0.0-rc.1.22426.10
|
||||
nappo download runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver 7.0.0-rc.1.22426.10
|
||||
nappo download runtime.linux-arm64.Microsoft.NETCore.ILAsm 7.0.0-rc.1.22426.10
|
||||
nappo download runtime.linux-arm64.Microsoft.NETCore.ILDAsm 7.0.0-rc.1.22426.10
|
||||
nappo download Microsoft.NETCore.App.Crossgen2.linux-arm64 7.0.0-rc.1.22426.10
|
||||
#nappo download microsoft.windowsdesktop.app.ref 6.0.9
|
||||
#nappo download microsoft.netcore.app.host.linux-arm64 6.0.9
|
||||
#nappo download microsoft.netcore.app.ref 6.0.9
|
||||
#nappo download microsoft.aspnetcore.app.ref 6.0.9
|
||||
#
|
||||
#nappo download Microsoft.AspNetCore.App.Runtime.linux-arm64 7.0.0-rc.1.22427.2
|
||||
#nappo download Microsoft.NETCore.App.Host.linux-arm64 7.0.0-rc.1.22426.10
|
||||
#nappo download Microsoft.NETCore.App.Runtime.linux-arm64 7.0.0-rc.1.22426.10
|
||||
#nappo download runtime.linux-arm64.Microsoft.NETCore.DotNetHost 7.0.0-rc.1.22426.10
|
||||
#nappo download runtime.linux-arm64.Microsoft.NETCore.DotNetHostPolicy 7.0.0-rc.1.22426.10
|
||||
#nappo download runtime.linux-arm64.Microsoft.NETCore.DotNetHostResolver 7.0.0-rc.1.22426.10
|
||||
#nappo download runtime.linux-arm64.Microsoft.NETCore.ILAsm 7.0.0-rc.1.22426.10
|
||||
#nappo download runtime.linux-arm64.Microsoft.NETCore.ILDAsm 7.0.0-rc.1.22426.10
|
||||
#nappo download Microsoft.NETCore.App.Crossgen2.linux-arm64 7.0.0-rc.1.22426.10
|
||||
|
||||
popd
|
||||
|
||||
tar czf "dotnet-arm64-prebuilts-$date.tar.gz" "dotnet-arm64-prebuilts-$date"
|
||||
tar czf "dotnet-prebuilts-${sdk_version}-arm64.tar.gz" "dotnet-prebuilts-${sdk_version}-arm64"
|
||||
|
||||
@ -1,4 +1,5 @@
|
||||
%bcond_with bootstrap
|
||||
# We dont' use %%bootstrap since that doesn't work in CentOS Koji
|
||||
%bcond_without bootstrap_dotnet
|
||||
|
||||
# LTO triggers a compilation error for a source level issue. Given that LTO should not
|
||||
# change the validity of any given source and the nature of the error (undefined enum), I
|
||||
@ -51,21 +52,22 @@
|
||||
|
||||
Name: dotnet7.0
|
||||
Version: %{sdk_rpm_version}
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?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}
|
||||
%if %{with bootstrap_dotnet}
|
||||
%global bootstrap_sdk_version 7.0.109
|
||||
# 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-2022-10-12.tar.gz
|
||||
Source1: dotnet-prebuilts-%{bootstrap_sdk_version}-arm64.tar.gz
|
||||
# Generated manually, same pattern as the arm64 tarball
|
||||
Source2: dotnet-ppc64le-prebuilts-2022-10-21.tar.gz
|
||||
Source2: dotnet-prebuilts-%{bootstrap_sdk_version}-ppc64le.tar.gz
|
||||
# Generated manually, same pattern as the arm64 tarball
|
||||
Source3: dotnet-s390x-prebuilts-2022-10-12.tar.gz
|
||||
Source3: dotnet-prebuilts-%{bootstrap_sdk_version}-s390x.tar.gz
|
||||
%else
|
||||
# The source is generated on a RHEL box via:
|
||||
# ./build-dotnet-tarball %%{upstream_tag}
|
||||
@ -90,7 +92,7 @@ ExclusiveArch: x86_64
|
||||
BuildRequires: clang
|
||||
BuildRequires: cmake
|
||||
BuildRequires: coreutils
|
||||
%if %{without bootstrap}
|
||||
%if %{without bootstrap_dotnet}
|
||||
BuildRequires: dotnet-sdk-7.0
|
||||
BuildRequires: dotnet-sdk-7.0-source-built-artifacts
|
||||
%endif
|
||||
@ -340,7 +342,7 @@ These are not meant for general use.
|
||||
|
||||
|
||||
%prep
|
||||
%if %{without bootstrap}
|
||||
%if %{without bootstrap_dotnet}
|
||||
%setup -q -n dotnet-%{upstream_tag}
|
||||
|
||||
# Remove all prebuilts
|
||||
@ -411,7 +413,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
|
||||
find previously-built-dotnet
|
||||
@ -466,7 +468,7 @@ export OPENSSL_ENABLE_SHA1_SIGNATURES=1
|
||||
%endif
|
||||
|
||||
VERBOSE=1 ./build.sh \
|
||||
%if %{without bootstrap}
|
||||
%if %{without bootstrap_dotnet}
|
||||
--with-sdk previously-built-dotnet \
|
||||
%endif
|
||||
%ifarch %{mono_archs}
|
||||
@ -619,6 +621,10 @@ export COMPlus_LTTng=0
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Aug 22 2023 Omair Majid <omajid@redhat.com> - 7.0.110-3
|
||||
- Enable bootstrap
|
||||
- Related: RHBZ#2228570
|
||||
|
||||
* Wed Aug 09 2023 Omair Majid <omajid@redhat.com> - 7.0.110-2
|
||||
- Update to .NET SDK 7.0.110 and Runtime 7.0.10
|
||||
- Resolves: RHBZ#2228570
|
||||
|
||||
5
sources
5
sources
@ -1 +1,4 @@
|
||||
SHA512 (dotnet-v7.0.110.tar.gz) = 7e4bdc958cb36833366192d513c056379a6b046f5c0d829b1e33b68c429efa3b5da4c006b69e3c32ca233178c368d463488d5afefab3b36a84604c5bd963681b
|
||||
SHA512 (dotnet-v7.0.110-x64-bootstrap.tar.xz) = 3c05e6b551969c2ec7343ccb0eafc863cad55802a007e0a76ef6bacbf3ab639b584741e847cb227a070da5abd714249e439221c314adaacf7f97dcbf15212fe9
|
||||
SHA512 (dotnet-prebuilts-7.0.109-arm64.tar.gz) = 9c43f5687e05c8724193b94ee28a483106617d6d1f633a083f9ea3c67d73f28a32871a31ef6e3d2f2658279ac1626562cf0027977206cad9e4df3a86fa633313
|
||||
SHA512 (dotnet-prebuilts-7.0.109-ppc64le.tar.gz) = 9d1a108e613ad1f18c1fc856594090ab8acc433b0a9d43c3837b7751d4e57ca084977b39a28cb26cbafacfac6441f15ca3c70c3116ac34526d25bd659f19a9fa
|
||||
SHA512 (dotnet-prebuilts-7.0.109-s390x.tar.gz) = 4a7b31f8945edf4f274e9915725af50b1d37a57e2d1ae0b633972dfcf50d6da43390f8b4a214881adcc278841ec22592a5193f5acef1da4399f650f510b7bd8b
|
||||
|
||||
Loading…
Reference in New Issue
Block a user