From 1ef46317aee262fd85f559e7a69af7075cf9baff Mon Sep 17 00:00:00 2001 From: Sangwook Kim Date: Mon, 23 Mar 2020 16:55:22 +0900 Subject: [Tizen] Generate tools R2R images --- packaging/coreclr-diagnostics.manifest | 3 +++ packaging/coreclr-diagnostics.spec | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/packaging/coreclr-diagnostics.manifest b/packaging/coreclr-diagnostics.manifest index 2a0cec501..bd0c9f637 100755 --- a/packaging/coreclr-diagnostics.manifest +++ b/packaging/coreclr-diagnostics.manifest @@ -2,4 +2,7 @@ + + + diff --git a/packaging/coreclr-diagnostics.spec b/packaging/coreclr-diagnostics.spec index bd63daf4c..00b4491ec 100755 --- a/packaging/coreclr-diagnostics.spec +++ b/packaging/coreclr-diagnostics.spec @@ -14,9 +14,11 @@ Source1: %{name}.manifest ExcludeArch: aarch64 -BuildRequires: cmake BuildRequires: clang >= 3.8 BuildRequires: clang-devel >= 3.8 +BuildRequires: cmake +BuildRequires: coreclr-devel +BuildRequires: corefx-managed BuildRequires: gettext-tools BuildRequires: libopenssl1.1-devel BuildRequires: libstdc++-devel @@ -60,7 +62,6 @@ Requires: libgcc Requires: libstdc++ Requires: libunwind Requires: libuuid -Requires(post): /usr/bin/chsmack %description This package contains components for basic .NET debugging and diagnostic support. @@ -180,6 +181,12 @@ cp -f %{_artifacts}/dotnet-counters/%{_buildtype}/netcoreapp*/publish/*.dll %{bu cp -f %{_artifacts}/dotnet-dump/%{_buildtype}/netcoreapp*/publish/*.dll %{buildroot}%{toolsdir} cp -f %{_artifacts}/dotnet-gcdump/%{_buildtype}/netcoreapp*/publish/*.dll %{buildroot}%{toolsdir} cp -f %{_artifacts}/dotnet-trace/%{_buildtype}/netcoreapp*/publish/*.dll %{buildroot}%{toolsdir} +%ifnarch %{ix86} +for f in %{buildroot}%{toolsdir}/*.dll; do + %{_datarootdir}/dotnet.tizen/netcoreapp/crossgen -ReadyToRun /p %{_datarootdir}/dotnet.tizen/netcoreapp:`dirname $f` $f +done +%endif +chmod 644 %{buildroot}%{toolsdir}/* ln -sf %{toolsdir} %{buildroot}%{toolsdir}/lib # For dotnet-launcher corerun mode ln -sf %{netcoreappdir} %{buildroot}%{toolsdir}/%{rid} # For SOS.Hosting (SOSSourcePath) @@ -195,5 +202,3 @@ ln -sf %{netcoreappdir} %{buildroot}%{toolsdir}/%{rid} # For SOS.Hosting (SOSSo %post tools chown owner:users /home/owner/share/tmp chown owner:users /home/owner/share/tmp/sdk_tools -chsmack -t -a User::App::Shared /home/owner/share/tmp -chsmack -t -a User::App::Shared /home/owner/share/tmp/sdk_tools -- cgit v1.2.3