diff --git a/.gitignore b/.gitignore index 0bdb79a..6b0dfde 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -dotnet-9.0.111.tar.gz +dotnet-9.0.112.tar.gz diff --git a/dotnet-9.0.111.tar.gz.sig b/dotnet-9.0.111.tar.gz.sig deleted file mode 100644 index 760e4c5..0000000 --- a/dotnet-9.0.111.tar.gz.sig +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: BSN Pgp v1.0.0.0 - -iQIcBAABCAAGBQJo3aD1AAoJEP2/U8JNtIcuzxUP/0/OlhFtCUfxVMMUCndsowkt -iNXil3CsUuo8Sc1WxIZmBbwOCnA17OV8E2Q799eCiPK16dbitl+BWN5I/C20cO9K -mEUBlcUdt/vtkxoOqYs50yW9Ew8bbkXtUorvWFxlegk8raI1/EOf2DQbd60CtbWB -7Q6lkgYJk5w7LcsTsqYXngyXYKnHBhQ9QYNncBr2T9FSuKx2Ndbv3sbit1FjzB73 -s4VAnySpNZ3N1xgZ7G1U6qpyip/00pkKtUCX26zFdXNEXiEDHr4CXpHsqlLh6r1d -mCVAkenztsDyr+nP8Wgri9QmMT+0UmvlW7RP0/qtwgFJf1TMM0DMiKQ7qF1RTBda -0z5uWwB9qVA6Wbu3i7JunddySRgXRJRzqbNCHI8h/TsmW+HbTdkEGc35TJ+4krY0 -AfOf6JoUWrnV3onNKqFmEcNKN9PoRS4+JLxYLRxJZ14QoS44Dv+A67Zm4T3jDTtG -fR1AFq1ANe77iytDTUldDY7pEJwt06KVh/1S6Tt476ym+KwZFOyPRRmHbYf87LCS -w3f8LxqG3s6hxio9/tTa+ZHx8OjYiIcA0FgbvZ46lOUNDHpytTjVaijKhbsm5Sr2 -/OgeJEisU6xfAfsEKeseYXwWLlTQBTqa0tvyBC3DwkRzKdql7sKtNwlO+ecs8fUp -3u1fKfYRTInMHtlaR20y -=PNIB ------END PGP SIGNATURE----- diff --git a/dotnet-9.0.112.tar.gz.sig b/dotnet-9.0.112.tar.gz.sig new file mode 100644 index 0000000..9a96716 --- /dev/null +++ b/dotnet-9.0.112.tar.gz.sig @@ -0,0 +1,17 @@ +-----BEGIN PGP SIGNATURE----- +Version: BSN Pgp v1.0.0.0 + +iQIcBAABCAAGBQJpA4uYAAoJEP2/U8JNtIcufQAQAKgtqGcDTijy1BfjnL3x1s4d +4g5LdyVYG3Zg2FtZK40jtMTA10Q5X5rHWAzq8vv3WM7GeGOEVOkPhXPvh2q0Tp4w +IgxVG1k9WwXTMrwey6xvu+jkJwDPvg3foGGO7jryq76x/1qKyAGbz+iKM0t7+EcY +S9sUUwGTgWnYgoTm/iCBgiX9yUFzbNNJqtXp+EC58MHqminrwlOcuuyrwmxNpwqx +EVY6PdFP7bn0uv5wdvDX/7VvC3RBZHjUsoSUDAdPqFXu6CT3ecTIksl6jTo/hTi/ +hRbciFtsx/MU8l/C430t1j4gRVPXYGKuQ5wjM9GlVmBOgbxC6Cci10fuIbv9U8VB +MB22EaJhxSpuSDbRtn+0azk6s1VjomAxY456Ab9SVr+tBI1YGNvqE7ZtlpPSAweH +ShbMWQZtSKz59KYlRQEYNwX4Ewc737vGqJSXULg7jeENNvCyd8IZd8morNwu5pK4 +aTRqBkGouuDxmh6INgJRgZPyIrDzhT3tdpi+XsieKpumxbvrQQz2gMo88RuZUjVj +wekVth4uRLX95C0CYQQqBzIvvdv38eqQ3INm3JrUw0BEvyiF9F4/PmYCRamvmQ0v +IbdY3iTmeOAd96ByrA/LY0HhfQycPBhJUdoiIJ1Pykb6rA7AtALm+auNkvxYwISC +uBSY6A8VapWXMPcUuFcg +=t7oH +-----END PGP SIGNATURE----- diff --git a/dotnet9.0.spec b/dotnet9.0.spec index 4022d08..23b22d4 100644 --- a/dotnet9.0.spec +++ b/dotnet9.0.spec @@ -14,13 +14,13 @@ # upstream can produce releases with a different tag than the SDK version #%%global upstream_tag v%%{runtime_version} -%global upstream_tag v9.0.111 +%global upstream_tag v9.0.112 %global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||') %global hostfxr_version %{runtime_version} -%global runtime_version 9.0.10 -%global aspnetcore_runtime_version 9.0.10 -%global sdk_version 9.0.111 +%global runtime_version 9.0.11 +%global aspnetcore_runtime_version 9.0.11 +%global sdk_version 9.0.112 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | sed -e 's|[[:digit:]][[:digit:]]$|00|') %global templates_version %{aspnetcore_runtime_version} #%%global templates_version %%(echo %%{runtime_version} | awk 'BEGIN { FS="."; OFS="." } {print $1, $2, $3+1 }') @@ -74,7 +74,7 @@ Name: dotnet%{dotnetver} Version: %{sdk_rpm_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: .NET Runtime and SDK License: 0BSD AND Apache-2.0 AND (Apache-2.0 WITH LLVM-exception) AND APSL-2.0 AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause AND BSL-1.0 AND bzip2-1.0.6 AND CC0-1.0 AND CC-BY-3.0 AND CC-BY-4.0 AND CC-PDDC AND CNRI-Python AND EPL-1.0 AND GPL-2.0-only AND (GPL-2.0-only WITH GCC-exception-2.0) AND GPL-2.0-or-later AND GPL-3.0-only AND ICU AND ISC AND LGPL-2.1-only AND LGPL-2.1-or-later AND LicenseRef-Fedora-Public-Domain AND LicenseRef-ISO-8879 AND MIT AND MIT-Wu AND MS-PL AND MS-RL AND NCSA AND OFL-1.1 AND OpenSSL AND Unicode-DFS-2015 AND Unicode-DFS-2016 AND W3C-19980720 AND X11 AND Zlib @@ -85,22 +85,22 @@ URL: https://github.com/dotnet/ # ./build-dotnet-bootstrap-tarball %%{upstream_tag} Source0: dotnet-%{upstream_tag}-x64-bootstrap.tar.gz # The bootstrap SDK version is one listed in the global.json file of the main source archive -%global bootstrap_sdk_version 9.0.100-rc.1.24452.12 +%global bootstrap_sdk_version 9.0.101 # Binaries can be at one of several different URLs: # GA releases: -# Source1: https://dotnetcli.azureedge.net/dotnet/Sdk/%%{bootstrap_sdk_version}/dotnet-sdk-%%{bootstrap_sdk_version}-linux-arm64.tar.gz +Source1: https://builds.dotnet.microsoft.com/dotnet/Sdk/%{bootstrap_sdk_version}/dotnet-sdk-%{bootstrap_sdk_version}-linux-arm64.tar.gz # Preview releases: -Source1: https://dotnetbuilds.azureedge.net/public/Sdk/%{bootstrap_sdk_version}/dotnet-sdk-%{bootstrap_sdk_version}-linux-arm64.tar.gz +# Source1: https://ci.dot.net/public/Sdk/%%{bootstrap_sdk_version}/dotnet-sdk-%%{bootstrap_sdk_version}-linux-arm64.tar.gz # To generate ppc64le and s390x archives: # 1. Find the source commits and versions of repos, use one of: -# - https://dotnetbuilds.azureedge.net/public/Sdk/%%{bootstrap_sdk_version}/productCommit-linux-x64.txt -# - https://dotnetcli.azureedge.net/dotnet/Sdk/%%{bootstrap_sdk_version}/productCommit-linux-x64.txt +# - https://builds.dotnet.microsoft.com/dotnet/Sdk/%%{bootstrap_sdk_version}/productCommit-linux-x64.txt +# - https://ci.dot.net/public/Sdk/%%{bootstrap_sdk_version}/productCommit-linux-x64.txt # 2. Find the VMR sync commit using `git log --grep $commit` # 3. Build the VMR commit in cross-build mode for the architecture # 4. Use `build-prebuilt-archive` to create the archive from the VMR # 5. Update the version below to match the SDK that was built from the VMR # The ppc64le/s390x SDK version is one produced -%global bootstrap_sdk_version_ppc64le_s390x 9.0.100-rc.1.24452.1 +%global bootstrap_sdk_version_ppc64le_s390x 9.0.101 Source2: dotnet-prebuilts-%{bootstrap_sdk_version_ppc64le_s390x}-ppc64le.tar.gz Source3: dotnet-prebuilts-%{bootstrap_sdk_version_ppc64le_s390x}-s390x.tar.gz %else @@ -416,10 +416,10 @@ Requires: dotnet-sdk-%{dotnetver}%{?_isa} >= %{sdk_rpm_version}-%{release} # When installing AOT support, also install all dependencies needed to build # NativeAOT applications. AOT invokes `clang ... -lssl -lcrypto -lbrotlienc # -lbrotlidec -lz ...`. -Requires: brotli-devel%{?_isa} -Requires: clang%{?_isa} -Requires: openssl-devel%{?_isa} -Requires: zlib-devel%{?_isa} +Requires: brotli-devel +Requires: clang +Requires: openssl-devel +Requires: zlib-devel %description -n dotnet-sdk-aot-%{dotnetver} This package provides Ahead-of-time (AOT) compilation support for the .NET SDK. @@ -570,6 +570,8 @@ rm -rf src/runtime/src/native/external/zlib-intel rm -rf src/runtime/src/native/external/zlib-ng %endif +lscpu + %build @@ -613,6 +615,14 @@ CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/ -march=z13//') CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/ -mtune=z14//') %endif +%if 0%{?rhel} >= 10 +# Workaround for https://github.com/dotnet/runtime/issues/109611 +# FIXME: Remove this, and replace with upstream fix +CFLAGS=$(echo $CFLAGS | sed -e 's/-march=x86-64-v3 //') +CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/-march=x86-64-v3 //') +LDFLAGS=$(echo $LDFLAGS | sed -e 's/-march=x86-64-v3 //') +%endif + # Enabling fortify-source and "-Wall -Weverything" produces new warnings from libc. Turn them off. CFLAGS="$CFLAGS -Wno-used-but-marked-unused" CXXFLAGS="$CXXFLAGS -Wno-used-but-marked-unused" @@ -653,9 +663,9 @@ max_attempts=1 %endif function retry_until_success { - local exit_code=1 - local tries=$1 - shift + local exit_code=1 + local tries=$1 + shift set +e while [[ $exit_code != 0 ]] && [[ $tries != 0 ]]; do (( tries = tries - 1 )) @@ -666,25 +676,38 @@ function retry_until_success { return $exit_code } -VERBOSE=1 retry_until_success $max_attempts \ - timeout 5h \ - ./build.sh \ - --source-only \ - --release-manifest %{SOURCE5} \ +cat >dotnet-rpm-build.sh < dotnet.sh @@ -885,81 +908,89 @@ export COMPlus_LTTng=0 %changelog +* Mon Nov 03 2025 Omair Majid - 9.0.112-1 +- Update to .NET SDK 9.0.112 and Runtime 9.0.11 +- Resolves: RHEL-125746 + * Tue Oct 14 2025 Omair Majid - 9.0.111-2 - Update to .NET SDK 9.0.111 and Runtime 9.0.10 -- Resolves: RHEL-116858 +- Resolves: RHEL-116861 * Wed Sep 10 2025 Omair Majid - 9.0.110-2 - Update to .NET SDK 9.0.110 and Runtime 9.0.9 -- Resolves: RHEL-112269 +- Resolves: RHEL-112268 * Mon Aug 11 2025 Omair Majid - 9.0.109-2 - Update to .NET SDK 9.0.109 and Runtime 9.0.8 -- Resolves: RHEL-106728 +- Resolves: RHEL-106727 * Tue Jul 08 2025 Omair Majid - 9.0.108-2 - Update to .NET SDK 9.0.108 and Runtime 9.0.7 -- Resolves: RHEL-100599 +- Resolves: RHEL-100597 * Wed Jun 11 2025 Omair Majid - 9.0.107-2 - Update to .NET SDK 9.0.107 and Runtime 9.0.6 -- Resolves: RHEL-94421 +- Resolves: RHEL-94423 * Tue May 13 2025 Omair Majid - 9.0.106-2 - Update to .NET SDK 9.0.106 and Runtime 9.0.5 -- Resolves: RHEL-89450 +- Resolves: RHEL-89452 * Wed Apr 09 2025 Omair Majid - 9.0.105-2 - Update to .NET SDK 9.0.105 and Runtime 9.0.4 -- Resolves: RHEL-85280 +- Resolves: RHEL-85281 * Tue Mar 11 2025 Omair Majid - 9.0.104-2 - Update to .NET SDK 9.0.104 and Runtime 9.0.3 -- Resolves: RHEL-81648 +- Resolves: RHEL-81647 * Mon Feb 17 2025 Omair Majid - 9.0.103-2 - Update to .NET SDK 9.0.103 and Runtime 9.0.2 -- Resolves: RHEL-76905 +- Resolves: RHEL-76904 -* Thu Jan 16 2025 Omair Majid - 9.0.102-2 -- Update to .NET SDK 9.0.102 and Runtime 9.0.1 -- Resolves: RHEL-71550 - -* Thu Dec 05 2024 Omair Majid - 9.0.101-3 -- Update to .NET SDK 9.0.101 and Runtime 9.0.0 -- Resolves: RHEL-69749 - -* Wed Nov 20 2024 Omair Majid - 9.0.100-2 -- Update to .NET SDK 9.0.100 and Runtime 9.0.0 -- Resolves: RHEL-65538 - -* Fri Oct 25 2024 Omair Majid - 9.0.100~rc.2.24474.1-0.7 +* Sat Jan 25 2025 Omair Majid - 9.0.102-2 - Disable bootstrap -- Related: RHEL-62776 +- Related: RHEL-71549 + +* Fri Jan 24 2025 Omair Majid - 9.0.102-1 +- Rebootstrap +- Related: RHEL-71549 + +* Thu Jan 16 2025 Omair Majid - 9.0.102-0.9 +- Update to .NET SDK 9.0.102 and Runtime 9.0.1 +- Resolves: RHEL-71549 + +* Tue Oct 29 2024 Troy Dawson - 9.0.100~rc.2.24474.1-0.8 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Wed Oct 23 2024 Omair Majid - 9.0.100~rc.2.24474.1-0.7 +- Disable bootstrap +- Related: RHEL-62799 * Tue Oct 22 2024 Omair Majid - 9.0.100~rc.2.24474.1-0.6 - Rebootstrap -- Related: RHEL-62776 +- Related: RHEL-62799 * Thu Oct 17 2024 Omair Majid - 9.0.100~rc.2.24474.1-0.5 - Add missing runtime dependencies to -aot- subpackage -- Related: RHEL-62776 +- Related: RHEL-62799 * Tue Oct 15 2024 Omair Majid - 9.0.100~rc.2.24474.1-0.4 - Update to .NET SDK 9.0.100-rc.2.24474.1 and Runtime 9.0.0-rc.2.24473.5 -- Resolves: RHEL-62776 +- Resolves: RHEL-62799 * Wed Sep 11 2024 Omair Majid - 9.0.100~rc.1.24452.12-0.3 - Update to .NET SDK 9.0.100-rc.1.24452.12 and Runtime 9.0.0-rc.1.24431.7 -- Resolves: RHEL-59026 +- Resolves: RHEL-59011 * Sun Aug 18 2024 Omair Majid - 9.0.100~preview.7.24407.1-0.2 - Disable bootstrap -- Related: RHEL-48617 +- Related: RHEL-48619 * Thu Aug 15 2024 Omair Majid - 9.0.100~preview.7.24407.1-0.1 -- Update to .NET SDK 9.0 preview 7 and Runtime 9.0 preview 7 -- Resolves: RHEL-48617 +- Update to .NET SDK 9 preview 7 and Runtime 9 preview 7 +- Resolves: RHEL-48619 * Thu Jun 13 2024 Omair Majid - 9.0.100~preview.5.24307.3-0.9 - Update to .NET SDK 9.0.100-preview.5.24307.3 and Runtime diff --git a/release.json b/release.json index 8980b12..7f288f1 100644 --- a/release.json +++ b/release.json @@ -1,10 +1,10 @@ { - "release": "9.0.10", + "release": "9.0.11", "channel": "9.0", - "tag": "v9.0.111", - "sdkVersion": "9.0.111", - "runtimeVersion": "9.0.10", - "aspNetCoreVersion": "9.0.10", + "tag": "v9.0.112", + "sdkVersion": "9.0.112", + "runtimeVersion": "9.0.11", + "aspNetCoreVersion": "9.0.11", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "838867fec3d758e34188af097f4f18a23c3800e8" + "sourceVersion": "191254d6485c508af3f6f8ff5f20e91fa63ee39c" } diff --git a/sources b/sources index 684f882..475b05f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dotnet-9.0.111.tar.gz) = 78f3dfe0811085a648d1ad226871881c47cbc014d515d3bbd7e987f74cd19f1b9f9c577b527f441da799ad1a59a53659b636634451f0ce4f7926593be4d3ccc1 +SHA512 (dotnet-9.0.112.tar.gz) = 16660ca0e7d2c3cddc6a25b464c9cbe5951ac3e4d27a50b4ad77809dfa39f2e1206c3d20b6b9495e8308226dabfd1535b065f13a6ee53931d0f494c89db2a31f