diff --git a/.gitignore b/.gitignore index 373b232..e955080 100644 --- a/.gitignore +++ b/.gitignore @@ -50,27 +50,3 @@ /dotnet-8.0.10.tar.gz.sig /dotnet-8.0.11.tar.gz /dotnet-8.0.11.tar.gz.sig -/dotnet-8.0.12.tar.gz -/dotnet-8.0.12.tar.gz.sig -/dotnet-8.0.13.tar.gz -/dotnet-8.0.13.tar.gz.sig -/dotnet-8.0.14.tar.gz -/dotnet-8.0.14.tar.gz.sig -/dotnet-8.0.15.tar.gz -/dotnet-8.0.15.tar.gz.sig -/dotnet-8.0.16.tar.gz -/dotnet-8.0.16.tar.gz.sig -/dotnet-8.0.17.tar.gz -/dotnet-8.0.17.tar.gz.sig -/dotnet-8.0.18.tar.gz -/dotnet-8.0.18.tar.gz.sig -/dotnet-8.0.119.tar.gz -/dotnet-8.0.119.tar.gz.sig -/dotnet-8.0.120.tar.gz -/dotnet-8.0.120.tar.gz.sig -/dotnet-8.0.121.tar.gz -/dotnet-8.0.121.tar.gz.sig -/dotnet-8.0.122.tar.gz -/dotnet-8.0.122.tar.gz.sig -/dotnet-8.0.123.tar.gz -/dotnet-8.0.123.tar.gz.sig diff --git a/dotnet8.0.spec b/dotnet8.0.spec index 6cc1b3a..75730a5 100644 --- a/dotnet8.0.spec +++ b/dotnet8.0.spec @@ -8,20 +8,16 @@ %global dotnetver 8.0 -# Only the package for the latest dotnet version should provide RPMs like -# dotnet-host and netstandard-targeting-pack-2.1 -%global is_latest_dotnet 0 - -%global host_version 8.0.23 -%global runtime_version 8.0.23 +%global host_version 8.0.11 +%global runtime_version 8.0.11 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 8.0.123 +%global sdk_version 8.0.111 %global sdk_feature_band_version %(echo %{sdk_version} | cut -d '-' -f 1 | 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 }') # upstream can produce releases with a different tag than the SDK version -%global upstream_tag v%{sdk_version} +%global upstream_tag v%{runtime_version} %global upstream_tag_without_v %(echo %{upstream_tag} | sed -e 's|^v||') %global host_rpm_version %{host_version} @@ -29,7 +25,15 @@ %global aspnetcore_runtime_rpm_version %{aspnetcore_runtime_version} %global sdk_rpm_version %{sdk_version} +%if 0%{?fedora} || 0%{?rhel} < 8 +%global use_bundled_libunwind 0 +%else %global use_bundled_libunwind 1 +%endif + +%ifarch aarch64 ppc64le s390x +%global use_bundled_libunwind 1 +%endif %ifarch aarch64 %global runtime_arch arm64 @@ -88,25 +92,19 @@ Patch2: vstest-intent-net8.0.patch Patch3: runtime-re-enable-implicit-rejection.patch # https://github.com/dotnet/msbuild/pull/9449 Patch4: msbuild-9449-exec-stop-setting-a-locale.patch +# TODO +Patch5: runtime-clang-19.patch # We disable checking the signature of the last certificate in a chain if the certificate is supposedly self-signed. # A side effect of not checking the self-signature of such a certificate is that disabled or unsupported message # digests used for the signature are not treated as fatal errors. # https://issues.redhat.com/browse/RHEL-25254 -Patch5: runtime-openssl-sha1.patch -# https://github.com/dotnet/runtime/issues/119706#issuecomment-3292624673 -Patch6: runtime-119706-clang-21.patch -# TODO send upstream -Patch7: runtime-clang-20-support.patch +Patch6: runtime-openssl-sha1.patch ExclusiveArch: aarch64 ppc64le s390x x86_64 -%if 0%{?fedora} >= 43 -BuildRequires: clang20 -%else BuildRequires: clang -%endif BuildRequires: cmake BuildRequires: coreutils %if %{without bootstrap} @@ -396,9 +394,7 @@ applications using the .NET SDK. %dotnet_targeting_pack dotnet-apphost-pack-%{dotnetver} %{runtime_rpm_version} Microsoft.NETCore.App %{dotnetver} Microsoft.NETCore.App.Host.%{runtime_id} %dotnet_targeting_pack dotnet-targeting-pack-%{dotnetver} %{runtime_rpm_version} Microsoft.NETCore.App %{dotnetver} Microsoft.NETCore.App.Ref %dotnet_targeting_pack aspnetcore-targeting-pack-%{dotnetver} %{aspnetcore_runtime_rpm_version} Microsoft.AspNetCore.App %{dotnetver} Microsoft.AspNetCore.App.Ref -%if %{is_latest_dotnet} %dotnet_targeting_pack netstandard-targeting-pack-2.1 %{sdk_rpm_version} NETStandard.Library 2.1 NETStandard.Library.Ref -%endif %package -n dotnet-sdk-%{dotnetver}-source-built-artifacts @@ -534,14 +530,6 @@ 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 - export EXTRA_CFLAGS="$CFLAGS" export EXTRA_CXXFLAGS="$CXXFLAGS" export EXTRA_LDFLAGS="$LDFLAGS" @@ -551,28 +539,7 @@ export EXTRA_LDFLAGS="$LDFLAGS" # suggested compile-time change doesn't work, unfortunately. export COMPlus_LTTng=0 -%ifarch ppc64le s390x -max_attempts=3 -%else -max_attempts=1 -%endif - -function retry_until_success { - local exit_code=1 - local tries=$1 - shift - set +e - while [[ $exit_code != 0 ]] && [[ $tries != 0 ]]; do - (( tries = tries - 1 )) - "$@" - exit_code=$? - done - set -e - return $exit_code -} - -VERBOSE=1 retry_until_success $max_attempts \ - timeout 5h \ +VERBOSE=1 timeout 5h \ ./build.sh \ %if %{without bootstrap} --with-sdk previously-built-dotnet \ @@ -634,7 +601,6 @@ find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.targets' -exec chmod -x {} find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.txt' -exec chmod -x {} \; find %{buildroot}%{_libdir}/dotnet/ -type f -name '*.xml' -exec chmod -x {} \; -%if %{is_latest_dotnet} install -dm 0755 %{buildroot}%{_sysconfdir}/profile.d/ install dotnet.sh %{buildroot}%{_sysconfdir}/profile.d/ @@ -659,7 +625,6 @@ echo "%{_libdir}/dotnet" >> install_location install install_location %{buildroot}%{_sysconfdir}/dotnet/ echo "%{_libdir}/dotnet" >> install_location_%{runtime_arch} install install_location_%{runtime_arch} %{buildroot}%{_sysconfdir}/dotnet/ -%endif install -dm 0755 %{buildroot}%{_libdir}/dotnet/source-built-artifacts install -m 0644 artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts.*.tar.gz %{buildroot}/%{_libdir}/dotnet/source-built-artifacts/ @@ -685,22 +650,6 @@ find %{buildroot}%{_libdir}/dotnet/sdk -type d | tail -n +2 | sed -E 's|%{buildr find %{buildroot}%{_libdir}/dotnet/sdk -type f -and -not -name '*.pdb' | sed -E 's|%{buildroot}||' >> dotnet-sdk-non-dbg-files find %{buildroot}%{_libdir}/dotnet/sdk -type f -name '*.pdb' | sed -E 's|%{buildroot}||' > dotnet-sdk-dbg-files -%if %{is_latest_dotnet} == 0 -# If this is an older version, self-test now, before we delete files. After we -# delete files, we will not have everything we need to self-test in %%check. -%{buildroot}%{_libdir}/dotnet/dotnet --info -%{buildroot}%{_libdir}/dotnet/dotnet --version - -# Provided by dotnet-host from another SRPM -rm %{buildroot}%{_libdir}/dotnet/LICENSE.txt -rm %{buildroot}%{_libdir}/dotnet/ThirdPartyNotices.txt -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 -rm %{buildroot}%{_rpmmacrodir}/macros.dotnet -%endif - - %check %if 0%{?fedora} > 35 @@ -708,10 +657,8 @@ rm %{buildroot}%{_rpmmacrodir}/macros.dotnet export COMPlus_LTTng=0 %endif -%if %{is_latest_dotnet} %{buildroot}%{_libdir}/dotnet/dotnet --info %{buildroot}%{_libdir}/dotnet/dotnet --version -%endif %if ( 0%{?fedora} && 0%{?fedora} < 38 ) || ( 0%{?rhel} && 0%{?rhel} < 9 ) @@ -719,7 +666,6 @@ export COMPlus_LTTng=0 # empty package useful for dependencies %endif -%if %{is_latest_dotnet} %files -n dotnet-host %dir %{_libdir}/dotnet %{_libdir}/dotnet/dotnet @@ -736,7 +682,6 @@ export COMPlus_LTTng=0 %dir %{_datadir}/bash-completion/completions %{_datadir}/bash-completion/completions/dotnet %{_rpmmacrodir}/macros.dotnet -%endif %files -n dotnet-hostfxr-%{dotnetver} %dir %{_libdir}/dotnet/host/fxr @@ -779,55 +724,6 @@ export COMPlus_LTTng=0 %changelog -* Tue Jan 13 2026 Omair Majid - 8.0.123-1 -- Update to .NET SDK 8.0.123 and Runtime 8.0.23 - -* Mon Nov 17 2025 Omair Majid - 8.0.122-1 -- Update to .NET SDK 8.0.122 and Runtime 8.0.22 - -* Thu Oct 30 2025 Omair Majid - 8.0.121-1 -- Update to .NET SDK 8.0.121 and Runtime 8.0.21 - -* Tue Oct 28 2025 Omair Majid - 8.0.120-2 -- Don't use clang 21 - -* Wed Sep 10 2025 Omair Majid - 8.0.120-1 -- Update to .NET SDK 8.0.120 and Runtime 8.0.20 - -* Wed Aug 06 2025 Omair Majid - 8.0.119-1 -- Update to .NET SDK 8.0.119 and Runtime 8.0.19 - -* Wed Jul 23 2025 Fedora Release Engineering - 8.0.118-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Tue Jul 08 2025 Omair Majid - 8.0.118-1 -- Update to .NET SDK 8.0.118 and Runtime 8.0.18 - -* Tue Jun 10 2025 Omair Majid - 8.0.117-1 -- Update to .NET SDK 8.0.117 and Runtime 8.0.17 - -* Tue May 13 2025 Omair Majid - 8.0.116-1 -- Update to .NET SDK 8.0.116 and Runtime 8.0.16 - -* Wed Apr 09 2025 Omair Majid - 8.0.115-1 -- Update to .NET SDK 8.0.115 and Runtime 8.0.15 - -* Tue Mar 11 2025 Omair Majid - 8.0.114-1 -- Update to .NET SDK 8.0.114 and Runtime 8.0.14 - -* Mon Feb 17 2025 Omair Majid - 8.0.113-1 -- Update to .NET SDK 8.0.113 and Runtime 8.0.13 - -* Thu Jan 16 2025 Omair Majid - 8.0.112-1 -- Update to .NET SDK 8.0.112 and Runtime 8.0.12 - -* Thu Jan 16 2025 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Tue Dec 10 2024 Omair Majid - 8.0.111-2 -- Fix ELN build -- Resolves: RHBZ#2321109 - * Mon Nov 18 2024 Omair Majid - 8.0.111-1 - Update to .NET SDK 8.0.111 and Runtime 8.0.11 diff --git a/gating.yaml b/gating.yaml index 6b6a8a9..b7ab3d1 100644 --- a/gating.yaml +++ b/gating.yaml @@ -20,3 +20,4 @@ product_versions: decision_context: osci_compose_gate rules: - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional} + - !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.other-archs.functional} diff --git a/release.json b/release.json index 15390f5..6c2c717 100644 --- a/release.json +++ b/release.json @@ -1,10 +1,10 @@ { - "release": "8.0.23", + "release": "8.0.11", "channel": "8.0", - "tag": "v8.0.123", - "sdkVersion": "8.0.123", - "runtimeVersion": "8.0.23", - "aspNetCoreVersion": "8.0.23", + "tag": "v8.0.11", + "sdkVersion": "8.0.111", + "runtimeVersion": "8.0.11", + "aspNetCoreVersion": "8.0.11", "sourceRepository": "https://github.com/dotnet/dotnet", - "sourceVersion": "fafff0660ef23ca2ece1444119524a76e0f4d4a4" + "sourceVersion": "d5f3d652f9266d600777f626a9650a273419859b" } diff --git a/runtime-119706-clang-21.patch b/runtime-119706-clang-21.patch deleted file mode 100644 index 9d97b4a..0000000 --- a/runtime-119706-clang-21.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git dotnet/src/runtime/eng/native/configurecompiler.cmake dotnet/src/runtime/eng/native/configurecompiler.cmake -index d54d9b6803b..9438cb5af7e 100644 ---- dotnet/src/runtime/eng/native/configurecompiler.cmake -+++ dotnet/src/runtime/eng/native/configurecompiler.cmake -@@ -574,6 +574,7 @@ if (CLR_CMAKE_HOST_UNIX OR CLR_CMAKE_HOST_WASI) - add_compile_options(-Wno-unused-function) - add_compile_options(-Wno-tautological-compare) - add_compile_options(-Wno-unknown-pragmas) -+ add_compile_options(-Wno-c++-compat) - - # Explicitly enabled warnings - check_c_compiler_flag(-Wimplicit-fallthrough COMPILER_SUPPORTS_W_IMPLICIT_FALLTHROUGH) -diff --git dotnet/src/runtime/src/coreclr/pal/prebuilt/inc/cordebug.h dotnet/src/runtime/src/coreclr/pal/prebuilt/inc/cordebug.h -index 78b86c69ee9..1672d602d99 100644 ---- dotnet/src/runtime/src/coreclr/pal/prebuilt/inc/cordebug.h -+++ dotnet/src/runtime/src/coreclr/pal/prebuilt/inc/cordebug.h -@@ -10036,6 +10036,7 @@ EXTERN_C const IID IID_ICorDebugRegisterSet2; - typedef - enum CorDebugUserState - { -+ CORDEBUG_INVALID = -1, - USER_STOP_REQUESTED = 0x1, - USER_SUSPEND_REQUESTED = 0x2, - USER_BACKGROUND = 0x4, diff --git a/runtime-clang-19.patch b/runtime-clang-19.patch new file mode 100644 index 0000000..9d24455 --- /dev/null +++ b/runtime-clang-19.patch @@ -0,0 +1,55 @@ +commit e356f564bf74909e77d000e3ad1b8b43c30d070c (HEAD -> release/8.0) +Author: Omair Majid +Date: Tue Oct 15 14:53:33 2024 -0400 + + Fix clang19 build (#105141) + +diff --git a/src/runtime/src/coreclr/vm/comreflectioncache.hpp b/src/runtime/src/coreclr/vm/comreflectioncache.hpp +index 08d173e6164..12db55251d8 100644 +--- a/src/runtime/src/coreclr/vm/comreflectioncache.hpp ++++ b/src/runtime/src/coreclr/vm/comreflectioncache.hpp +@@ -26,6 +26,7 @@ public: + + void Init(); + ++#ifndef DACCESS_COMPILE + BOOL GetFromCache(Element *pElement, CacheType& rv) + { + CONTRACTL +@@ -102,6 +103,7 @@ public: + AdjustStamp(TRUE); + this->LeaveWrite(); + } ++#endif // !DACCESS_COMPILE + + private: + // Lock must have been taken before calling this. +@@ -141,6 +143,7 @@ private: + return CacheSize; + } + ++#ifndef DACCESS_COMPILE + void AdjustStamp(BOOL hasWriterLock) + { + CONTRACTL +@@ -170,6 +173,7 @@ private: + if (!hasWriterLock) + this->LeaveWrite(); + } ++#endif // !DACCESS_COMPILE + + void UpdateHashTable(SIZE_T hash, int slot) + { +diff --git a/src/runtime/src/native/libs/CMakeLists.txt b/src/runtime/src/native/libs/CMakeLists.txt +index b8ec2cf654c..ca8590985d6 100644 +--- a/src/runtime/src/native/libs/CMakeLists.txt ++++ b/src/runtime/src/native/libs/CMakeLists.txt +@@ -128,6 +128,8 @@ if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_BROWSER OR CLR_CMAKE_TARGET_WASI) + add_compile_options(-Wno-cast-align) + add_compile_options(-Wno-typedef-redefinition) + add_compile_options(-Wno-c11-extensions) ++ add_compile_options(-Wno-pre-c11-compat) # fixes build on Debian ++ add_compile_options(-Wno-unknown-warning-option) # unknown warning option '-Wno-pre-c11-compat' + add_compile_options(-Wno-thread-safety-analysis) + if (CLR_CMAKE_TARGET_BROWSER) + add_compile_options(-Wno-unsafe-buffer-usage) diff --git a/runtime-clang-20-support.patch b/runtime-clang-20-support.patch deleted file mode 100644 index bffcf79..0000000 --- a/runtime-clang-20-support.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/eng/common/native/init-compiler.sh -+++ b/eng/common/native/init-compiler.sh -@@ -63,7 +63,7 @@ - # Set default versions - if [ -z "$majorVersion" ]; then - # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. -- if [ "$compiler" = "clang" ]; then versions="18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" -+ if [ "$compiler" = "clang" ]; then versions="20 19 18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" - elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi - - for version in $versions; do ---- a/src/runtime/eng/common/native/init-compiler.sh -+++ b/src/runtime/eng/common/native/init-compiler.sh -@@ -63,7 +63,7 @@ - # Set default versions - if [ -z "$majorVersion" ]; then - # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. -- if [ "$compiler" = "clang" ]; then versions="18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" -+ if [ "$compiler" = "clang" ]; then versions="20 19 18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" - elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi - - for version in $versions; do diff --git a/sources b/sources index c823863..26ce1d8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (dotnet-8.0.123.tar.gz) = 650372d872a91945b5b1f45a72a0fad97a068eec66add2278ae2cfe1196ca109e1c5d02eab389a28790b38f7dcee4731c165fade6c93849c4551b0b40055618c -SHA512 (dotnet-8.0.123.tar.gz.sig) = d5e88940fb4768674629b5b8fd321cee0432331da72397b226069320312b69deb9b06663f443fd2509e9a983a8360e64ee6e08d20008c48c77bb9ae35044b318 +SHA512 (dotnet-8.0.11.tar.gz) = 1bd689e560114d3cbe6a40d6608b0f5f493bef5e4d74f973c37d2e4bf88f999c769c12c390300f1d51094252a5791930c65547e1e4b8fa33387f995d296687f9 +SHA512 (dotnet-8.0.11.tar.gz.sig) = 32c104a7515149c182a41b5616a5c4ae3d8572f9a95480d41941bf93265c8cdf7eafad1f7ff243592b6188ebecd89272b3d9391fd20e4ad4111a6029fcf31c5e diff --git a/tests/ci.fmf b/tests/ci.fmf index 44ebb2c..f7e9bee 100644 --- a/tests/ci.fmf +++ b/tests/ci.fmf @@ -1,9 +1,7 @@ summary: Basic smoke test provision: - hardware: - disk: - - size: ">= 20 GiB" - memory: ">= 5120 MiB" + disk: 20 + memory: 5120 prepare: how: install package: diff --git a/update-release b/update-release index 36454b6..78d84ee 100755 --- a/update-release +++ b/update-release @@ -104,7 +104,7 @@ else cp -a "${user_provided_tarball_name}" "dotnet-${tag}.tar.gz" cp -a "${release_json}" release.json else - rm -f release.json + rm release.json spectool -g "$spec_file" fi fi