From 0eec65aad2f62feafe371714cb35c5f29ef67ae8 Mon Sep 17 00:00:00 2001 From: Mikhail Kurinnoi Date: Wed, 8 May 2024 14:06:06 +0300 Subject: [PATCH] [Tizen] Fix `help command` output for tools. Related to: > help clrstack ERROR: Could not find file '/usr/share/dotnet/shared/Microsoft.NETCore.App/8.0.0/SOS/linux-riscv64/sosdocsunix.txt'. --- packaging/coreclr-diagnostics.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packaging/coreclr-diagnostics.spec b/packaging/coreclr-diagnostics.spec index b794d951b..2f5a21df4 100755 --- a/packaging/coreclr-diagnostics.spec +++ b/packaging/coreclr-diagnostics.spec @@ -204,6 +204,8 @@ cp %{_artifacts}/linux.%{_barch}.%{_buildtype}/libsos.so %{buildroot}%{diagnosti %ifnarch riscv64 cp %{_artifacts}/linux.%{_barch}.%{_buildtype}/libsosplugin.so %{buildroot}%{diagnosticsdir}/%{rid} %endif +# put sosdocsunix.txt close to libsos.so copy (need for `help command`) +cp -f %{_artifacts}/linux.%{_barch}.%{_buildtype}/sosdocsunix.txt %{buildroot}%{diagnosticsdir}/%{rid} cp %{_artifacts}/linux.%{_barch}.%{_buildtype}/Microsoft.Bcl.AsyncInterfaces.dll %{buildroot}%{diagnosticsdir} cp %{_artifacts}/linux.%{_barch}.%{_buildtype}/Microsoft.Diagnostics.DebugServices.dll %{buildroot}%{diagnosticsdir} cp %{_artifacts}/linux.%{_barch}.%{_buildtype}/Microsoft.Diagnostics.DebugServices.Implementation.dll %{buildroot}%{diagnosticsdir} @@ -224,7 +226,6 @@ cp %{_artifacts}/linux.%{_barch}.%{_buildtype}/SOS.Extensions.dll %{buildroot}%{ cp %{_artifacts}/linux.%{_barch}.%{_buildtype}/SOS.Hosting.dll %{buildroot}%{diagnosticsdir} cp %{_artifacts}/linux.%{_barch}.%{_buildtype}/SOS.InstallHelper.dll %{buildroot}%{diagnosticsdir} cp %{_artifacts}/linux.%{_barch}.%{_buildtype}/System.CommandLine.dll %{buildroot}%{diagnosticsdir} -cp -f %{_artifacts}/linux.%{_barch}.%{_buildtype}/sosdocsunix.txt %{buildroot}%{diagnosticsdir} # Tools for name in counters dump gcdump stack trace; do @@ -233,6 +234,8 @@ done for so in `find %{buildroot}%{diagnosticsdir}/%{rid} -type f -name "*.so" -exec basename {} \;`; do ln -sf %{rid}/${so} %{buildroot}%{diagnosticsdir} done +# put sosdocsunix.txt close to libsos.so copy (need for `help command`) +cp -f %{buildroot}%{diagnosticsdir}/%{rid}/sosdocsunix.txt %{buildroot}%{diagnosticsdir} # remove CoreCLR system DLLs rm -f %{buildroot}%{diagnosticsdir}/System.Collections.Immutable.dll -- 2.34.1