From 012c53e281fe907b5422b87fd8c62f2eacc841bf Mon Sep 17 00:00:00 2001 From: Omair Majid Date: Thu, 14 Apr 2022 17:31:57 -0400 Subject: [PATCH] Update to .NET SDK 6.0.104 and Runtime 6.0.4 --- .gitignore | 1 + check-debug-symbols.py | 3 +-- dotnet6.0.spec | 23 +++++++++++++---------- runtime-66594-s390x-debuginfo.patch | 29 +++++++++++++++++++++++++++++ sources | 2 +- 5 files changed, 45 insertions(+), 13 deletions(-) create mode 100644 runtime-66594-s390x-debuginfo.patch diff --git a/.gitignore b/.gitignore index 7bde969..f03c348 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /dotnet-v6.0.101.tar.gz /dotnet-v6.0.102.tar.gz /dotnet-v6.0.103.tar.gz +/dotnet-v6.0.104.tar.gz diff --git a/check-debug-symbols.py b/check-debug-symbols.py index b873c77..d759f47 100755 --- a/check-debug-symbols.py +++ b/check-debug-symbols.py @@ -65,11 +65,10 @@ 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): - # print(file) return scan_file(file) return None diff --git a/dotnet6.0.spec b/dotnet6.0.spec index 66c4564..607493b 100644 --- a/dotnet6.0.spec +++ b/dotnet6.0.spec @@ -20,10 +20,11 @@ # until that's done, disable LTO. This has to happen before setting the flags below. %define _lto_cflags %{nil} -%global host_version 6.0.3 -%global runtime_version 6.0.3 +%global host_version 6.0.4 +%global runtime_version 6.0.4 %global aspnetcore_runtime_version %{runtime_version} -%global sdk_version 6.0.103 +%global sdk_version 6.0.104 +%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 }') @@ -85,7 +86,10 @@ Source11: dotnet.sh.in 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 Patch101: runtime-mono-remove-ilstrip.patch +# https://github.com/dotnet/runtime/pull/65392 Patch102: runtime-fedora-37-rid.patch +# https://github.com/dotnet/runtime/pull/66594 +Patch103: runtime-66594-s390x-debuginfo.patch # https://github.com/dotnet/command-line-api/pull/1401 Patch300: command-line-api-use-work-tree-with-git-apply.patch @@ -134,6 +138,7 @@ ExclusiveArch: aarch64 x86_64 s390x ExclusiveArch: x86_64 %endif + BuildRequires: clang BuildRequires: cmake BuildRequires: coreutils @@ -409,6 +414,7 @@ pushd src/runtime.* %patch100 -p1 %patch101 -p1 %patch102 -p1 +%patch103 -p1 popd pushd src/command-line-api.* @@ -465,10 +471,6 @@ pushd src/installer.* %patch1600 -p1 popd -# Disable package validation which breaks our build. -# There's no need to run validation in RPM packages anyway. -# See https://github.com/dotnet/runtime/pull/60881 -sed -i -E 's|( /p:BuildDebPackage=false)|\1 /p:EnablePackageValidation=false|' src/runtime.*/eng/SourceBuild.props %if ! %{use_bundled_libunwind} sed -i -E 's|( /p:BuildDebPackage=false)|\1 --cmakeargs -DCLR_CMAKE_USE_SYSTEM_LIBUNWIND=TRUE|' src/runtime.*/eng/SourceBuild.props @@ -596,7 +598,6 @@ install -m 0644 artifacts/%{runtime_arch}/Release/Private.SourceBuilt.Artifacts. # Quick and dirty check for https://github.com/dotnet/source-build/issues/2731 test -f %{buildroot}%{_libdir}/dotnet/sdk/%{sdk_version}/Sdks/Microsoft.NET.Sdk/Sdk/Sdk.props - # Check debug symbols in all elf objects. This is not in %%check # because native binaries are stripped by rpm-build after %%install. # So we need to do this check earlier. @@ -654,8 +655,7 @@ export COMPlus_LTTng=0 %dir %{_libdir}/dotnet/sdk %{_libdir}/dotnet/sdk/%{sdk_version} %dir %{_libdir}/dotnet/sdk-manifests -# FIXME hardcoded version? -%{_libdir}/dotnet/sdk-manifests/6.0.100 +%{_libdir}/dotnet/sdk-manifests/%{sdk_feature_band_version} %{_libdir}/dotnet/metadata %dir %{_libdir}/dotnet/packs @@ -665,6 +665,9 @@ export COMPlus_LTTng=0 %changelog +* Tue Apr 12 2022 Omair Majid - 6.0.104-1 +- Update to .NET SDK 6.0.104 and Runtime 6.0.4 + * Thu Mar 10 2022 Omair Majid - 6.0.103-1 - Update to .NET SDK 6.0.103 and Runtime 6.0.3 diff --git a/runtime-66594-s390x-debuginfo.patch b/runtime-66594-s390x-debuginfo.patch new file mode 100644 index 0000000..5637645 --- /dev/null +++ b/runtime-66594-s390x-debuginfo.patch @@ -0,0 +1,29 @@ +diff --git a/src/mono/mono.proj b/src/mono/mono.proj +index fb98ffc1896..d6a0c9a8ec2 100644 +--- a/src/mono/mono.proj ++++ b/src/mono/mono.proj +@@ -519,17 +519,17 @@ + + <_Objcopy Condition="'$(_ObjcopyFound)' != '0'">objcopy + +- ++ + + + + +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ + + + diff --git a/sources b/sources index 8daada4..0f44321 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (dotnet-v6.0.103.tar.gz) = 7fc7f9f8aa9b7491a72884ec08ea3269a35ee5d6295e19b8c9b4d5b61262bebcfeae8f945bf2bdb0f1cb4ebdfd57f9a06490e8062e0319494ddecc4606e8d052 +SHA512 (dotnet-v6.0.104.tar.gz) = db996788a8144f5438ff292537bb32f4953fce8fe8636ce41954d6206d03efa5a77bf456a7952119347169f5f5962ee3b95c0e73f35912b8ea0768ee3de09d3d