From 7a9144c6fe3a740e4576e015478586ed82307eea Mon Sep 17 00:00:00 2001 From: Woongsuk Cho Date: Mon, 15 Apr 2019 11:01:40 +0900 Subject: [PATCH] Use runtime directory to get crossgen path instead of device api directory crossgen executable is included in the coreclr package. So, it is more natural to use the coreclr directory. In addition, we have to eliminate unnecessary errors which occured while removing coreclr-extra packages from the image. --- packaging/dotnet-launcher.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packaging/dotnet-launcher.spec b/packaging/dotnet-launcher.spec index a073f42..74b03ba 100644 --- a/packaging/dotnet-launcher.spec +++ b/packaging/dotnet-launcher.spec @@ -30,6 +30,10 @@ BuildRequires: compiler-rt Requires: aul Requires: liblaunchpad +Requires: coreclr +Requires: mscorlib +Requires: corefx-native +Requires: corefx-managed Requires(post): /sbin/ldconfig Requires(post): /usr/bin/systemctl @@ -87,7 +91,7 @@ cmake \ -DCMAKE_BUILD_TYPE=%{_dotnet_build_conf} \ -DDEVICE_API_DIR=%{_device_api_dir} \ -DRUNTIME_DIR=%{_runtime_dir} \ - -DCROSSGEN_PATH=%{_device_api_dir}/crossgen \ + -DCROSSGEN_PATH=%{_runtime_dir}/crossgen \ -DINSTALL_MDPLUGIN_DIR=%{_install_mdplugin_dir} \ -DVERSION=%{version} \ -DNATIVE_LIB_DIR=%{_native_lib_dir} \ -- 2.7.4