summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiyoung Yun <jy910.yun@samsung.com>2017-01-31 01:18:34 (GMT)
committerJiyoung Yun <jy910.yun@samsung.com>2017-02-21 05:47:11 (GMT)
commit06f7a7944486e03c7b2c74f41c90cae295967546 (patch)
tree946a1fa0f416ad3f4c3b2b2ca4803789c5be6213
parentc23e5b500cd5383b80a2f9e24dbb77dafdb8571c (diff)
downloadcoreclr-06f7a7944486e03c7b2c74f41c90cae295967546.zip
coreclr-06f7a7944486e03c7b2c74f41c90cae295967546.tar.gz
coreclr-06f7a7944486e03c7b2c74f41c90cae295967546.tar.bz2
Move the location of .NET modules to %{_datadir}
Signed-off-by: Jiyoung Yun <jy910.yun@samsung.com> Change-Id: I46fe0873f8d27520017d2f3255298b6198938f08
-rw-r--r--packaging/coreclr.spec119
1 files changed, 53 insertions, 66 deletions
diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
index b04560e..68dbc1c 100644
--- a/packaging/coreclr.spec
+++ b/packaging/coreclr.spec
@@ -249,116 +249,103 @@ echo %{CORECLR_GIT_HASH} > .clrinfo
%define dotnetdir dotnet
%define netshareddir %{dotnetdir}/shared
%define netcoreappdir %{netshareddir}/Microsoft.NETCore.App/%{dotnet_version}
-mkdir -p %{buildroot}/opt/usr/share/%{netcoreappdir}
+mkdir -p %{buildroot}%{_datadir}/%{netcoreappdir}
# .NET Tizen Runtime
%define dotnettizendir dotnet.tizen
%define dotnetfwdir %{dotnettizendir}/framework
%define dotnettestdir %{dotnettizendir}/test
-mkdir -p %{buildroot}/opt/usr/share/%{dotnettizendir}
-mkdir -p %{buildroot}/opt/usr/share/%{dotnetfwdir}
-mkdir -p %{buildroot}/opt/usr/share/%{dotnettestdir}
+mkdir -p %{buildroot}%{_datadir}/%{dotnettizendir}
+mkdir -p %{buildroot}%{_datadir}/%{dotnetfwdir}
+mkdir -p %{buildroot}%{_datadir}/%{dotnettestdir}
# .NET & Mono CoreOverlay
%define tizennetdir tizen.net
-%define tizenmonodir tizen.mono
-mkdir -p %{buildroot}/opt/usr/share/%{tizennetdir}
-mkdir -p %{buildroot}/opt/usr/share/%{tizenmonodir}
+mkdir -p %{buildroot}%{_datadir}/%{tizennetdir}
%if 0%{skipnative}
%else
-cp %{_reldir}/corerun %{buildroot}/opt/usr/share/%{netcoreappdir}
-cp %{_reldir}/libclrjit.so %{buildroot}/opt/usr/share/%{netcoreappdir}
-cp %{_reldir}/libcoreclr.so %{buildroot}/opt/usr/share/%{netcoreappdir}
-cp %{_reldir}/libdbgshim.so %{buildroot}/opt/usr/share/%{netcoreappdir}
-cp %{_reldir}/libmscordaccore.so %{buildroot}/opt/usr/share/%{netcoreappdir}
-cp %{_reldir}/libmscordbi.so %{buildroot}/opt/usr/share/%{netcoreappdir}
-cp %{_reldir}/libsos.so %{buildroot}/opt/usr/share/%{netcoreappdir}
-cp %{_reldir}/libsosplugin.so %{buildroot}/opt/usr/share/%{netcoreappdir}
-cp %{_reldir}/System.Globalization.Native.so %{buildroot}/opt/usr/share/%{netcoreappdir}
-ln -sf ../%{netcoreappdir}/corerun %{buildroot}/opt/usr/share/%{dotnetdir}/corerun
+cp %{_reldir}/corerun %{buildroot}%{_datadir}/%{netcoreappdir}
+cp %{_reldir}/libclrjit.so %{buildroot}%{_datadir}/%{netcoreappdir}
+cp %{_reldir}/libcoreclr.so %{buildroot}%{_datadir}/%{netcoreappdir}
+cp %{_reldir}/libdbgshim.so %{buildroot}%{_datadir}/%{netcoreappdir}
+cp %{_reldir}/libmscordaccore.so %{buildroot}%{_datadir}/%{netcoreappdir}
+cp %{_reldir}/libmscordbi.so %{buildroot}%{_datadir}/%{netcoreappdir}
+cp %{_reldir}/libsos.so %{buildroot}%{_datadir}/%{netcoreappdir}
+cp %{_reldir}/libsosplugin.so %{buildroot}%{_datadir}/%{netcoreappdir}
+cp %{_reldir}/System.Globalization.Native.so %{buildroot}%{_datadir}/%{netcoreappdir}
+ln -sf ../%{netcoreappdir}/corerun %{buildroot}%{_datadir}/%{dotnetdir}/corerun
# make link for .NET CoreOverlay
-ln -sf ../%{netcoreappdir}/corerun %{buildroot}/opt/usr/share/%{tizennetdir}
-ln -sf ../%{netcoreappdir}/libclrjit.so %{buildroot}/opt/usr/share/%{tizennetdir}
-ln -sf ../%{netcoreappdir}/libcoreclr.so %{buildroot}/opt/usr/share/%{tizennetdir}
-ln -sf ../%{netcoreappdir}/libdbgshim.so %{buildroot}/opt/usr/share/%{tizennetdir}
-ln -sf ../%{netcoreappdir}/libmscordaccore.so %{buildroot}/opt/usr/share/%{tizennetdir}
-ln -sf ../%{netcoreappdir}/libmscordbi.so %{buildroot}/opt/usr/share/%{tizennetdir}
-ln -sf ../%{netcoreappdir}/libsos.so %{buildroot}/opt/usr/share/%{tizennetdir}
-ln -sf ../%{netcoreappdir}/libsosplugin.so %{buildroot}/opt/usr/share/%{tizennetdir}
-ln -sf ../%{netcoreappdir}/System.Globalization.Native.so %{buildroot}/opt/usr/share/%{tizennetdir}
+ln -sf ../%{netcoreappdir}/corerun %{buildroot}%{_datadir}/%{tizennetdir}
+ln -sf ../%{netcoreappdir}/libclrjit.so %{buildroot}%{_datadir}/%{tizennetdir}
+ln -sf ../%{netcoreappdir}/libcoreclr.so %{buildroot}%{_datadir}/%{tizennetdir}
+ln -sf ../%{netcoreappdir}/libdbgshim.so %{buildroot}%{_datadir}/%{tizennetdir}
+ln -sf ../%{netcoreappdir}/libmscordaccore.so %{buildroot}%{_datadir}/%{tizennetdir}
+ln -sf ../%{netcoreappdir}/libmscordbi.so %{buildroot}%{_datadir}/%{tizennetdir}
+ln -sf ../%{netcoreappdir}/libsos.so %{buildroot}%{_datadir}/%{tizennetdir}
+ln -sf ../%{netcoreappdir}/libsosplugin.so %{buildroot}%{_datadir}/%{tizennetdir}
+ln -sf ../%{netcoreappdir}/System.Globalization.Native.so %{buildroot}%{_datadir}/%{tizennetdir}
# extra
-cp %{_reldir}/coreconsole %{buildroot}/opt/usr/share/%{dotnetfwdir}
-cp %{_reldir}/crossgen %{buildroot}/opt/usr/share/%{dotnetfwdir}
-cp %{_reldir}/ilasm %{buildroot}/opt/usr/share/%{dotnetfwdir}
-cp %{_reldir}/ildasm %{buildroot}/opt/usr/share/%{dotnetfwdir}
+cp %{_reldir}/coreconsole %{buildroot}%{_datadir}/%{dotnetfwdir}
+cp %{_reldir}/crossgen %{buildroot}%{_datadir}/%{dotnetfwdir}
+cp %{_reldir}/ilasm %{buildroot}%{_datadir}/%{dotnetfwdir}
+cp %{_reldir}/ildasm %{buildroot}%{_datadir}/%{dotnetfwdir}
# test
-cp -rf bin/obj/Linux.%{_barch}.%{_buildtype}/tests/src %{buildroot}/opt/usr/share/%{dotnettestdir}
+cp -rf bin/obj/Linux.%{_barch}.%{_buildtype}/tests/src %{buildroot}%{_datadir}/%{dotnettestdir}
-# make linke to /usr/share
-mkdir -p %{buildroot}%{_datadir}
-ln -sf /opt/usr/share/%{dotnetdir} %{buildroot}%{_datadir}/
-ln -sf /opt/usr/share/%{dotnettizendir} %{buildroot}%{_datadir}/
-ln -sf /opt/usr/share/%{tizennetdir} %{buildroot}%{_datadir}/
-
-cp -rf .clrinfo %{buildroot}/opt/usr/share/%{tizennetdir}
+# info
+cp -rf .clrinfo %{buildroot}%{_datadir}/%{tizennetdir}
%endif
%if 0%{skipmscorlib}
%else
-cp %{_reldir}/mscorlib.dll %{buildroot}/opt/usr/share/%{netcoreappdir}
-#cp %{_reldir}/mscorlib.ni.dll %{buildroot}/opt/usr/share/%{netcoreappdir}
-cp %{_reldir}/System.Private.CoreLib.dll %{buildroot}/opt/usr/share/%{netcoreappdir}
-#cp %{_reldir}/System.Private.CoreLib.ni.dll %{buildroot}/opt/usr/share/%{netcoreappdir}
-cp %{_reldir}/SOS.NETCore.dll %{buildroot}/opt/usr/share/%{netcoreappdir}
+cp %{_reldir}/mscorlib.dll %{buildroot}%{_datadir}/%{netcoreappdir}
+#cp %{_reldir}/mscorlib.ni.dll %{buildroot}%{_datadir}/%{netcoreappdir}
+cp %{_reldir}/System.Private.CoreLib.dll %{buildroot}%{_datadir}/%{netcoreappdir}
+#cp %{_reldir}/System.Private.CoreLib.ni.dll %{buildroot}%{_datadir}/%{netcoreappdir}
+cp %{_reldir}/SOS.NETCore.dll %{buildroot}%{_datadir}/%{netcoreappdir}
# make link for .NET CoreOverlay
-ln -sf ../%{netcoreappdir}/mscorlib.dll %{buildroot}/opt/usr/share/%{tizennetdir}
-#ln -sf ../%{netcoreappdir}/mscorlib.ni.dll %{buildroot}/opt/usr/share/%{tizennetdir}
-ln -sf ../%{netcoreappdir}/System.Private.CoreLib.dll %{buildroot}/opt/usr/share/%{tizennetdir}
-#ln -sf ../%{netcoreappdir}/System.Private.CoreLib.ni.dll %{buildroot}/opt/usr/share/%{tizennetdir}
-ln -sf ../%{netcoreappdir}/SOS.NETCore.dll %{buildroot}/opt/usr/share/%{tizennetdir}
+ln -sf ../%{netcoreappdir}/mscorlib.dll %{buildroot}%{_datadir}/%{tizennetdir}
+#ln -sf ../%{netcoreappdir}/mscorlib.ni.dll %{buildroot}%{_datadir}/%{tizennetdir}
+ln -sf ../%{netcoreappdir}/System.Private.CoreLib.dll %{buildroot}%{_datadir}/%{tizennetdir}
+#ln -sf ../%{netcoreappdir}/System.Private.CoreLib.ni.dll %{buildroot}%{_datadir}/%{tizennetdir}
+ln -sf ../%{netcoreappdir}/SOS.NETCore.dll %{buildroot}%{_datadir}/%{tizennetdir}
%endif
%if 0%{skipnative}
%else
%files
%manifest %{name}.manifest
-%dir /opt/usr/share/%{dotnetdir}
-%dir /opt/usr/share/%{netcoreappdir}
-%dir /opt/usr/share/%{tizennetdir}
-/opt/usr/share/%{netcoreappdir}/corerun
-/opt/usr/share/%{netcoreappdir}/*.so
-/opt/usr/share/%{tizennetdir}/*
-/opt/usr/share/%{tizennetdir}/.clrinfo
-/opt/usr/share/%{dotnetdir}/corerun
%dir %{_datadir}/%{dotnetdir}
-%dir %{_datadir}/%{dotnettizendir}
+%dir %{_datadir}/%{netcoreappdir}
%dir %{_datadir}/%{tizennetdir}
+%{_datadir}/%{netcoreappdir}/corerun
+%{_datadir}/%{netcoreappdir}/*.so
+%{_datadir}/%{tizennetdir}/*
+%{_datadir}/%{tizennetdir}/.clrinfo
+%{_datadir}/%{dotnetdir}/corerun
%files extra
%manifest %{name}.manifest
-%dir /opt/usr/share/%{dotnetfwdir}
-/opt/usr/share/%{dotnetfwdir}/*
+%dir %{_datadir}/%{dotnetfwdir}
+%{_datadir}/%{dotnetfwdir}/*
%files test
%manifest %{name}.manifest
-%dir /opt/usr/share/%{dotnettestdir}
-/opt/usr/share/%{dotnettestdir}/*
+%dir %{_datadir}/%{dotnettestdir}
+%{_datadir}/%{dotnettestdir}/*
%endif
%if 0%{skipmscorlib}
%else
%files -n mscorlib
%manifest %{name}.manifest
-%dir /opt/usr/share/%{dotnetdir}
-%dir /opt/usr/share/%{netcoreappdir}
-%dir /opt/usr/share/%{tizennetdir}
-/opt/usr/share/%{netcoreappdir}/*.dll
-/opt/usr/share/%{tizennetdir}/*.dll
+%{_datadir}/%{netcoreappdir}/*.dll
+%{_datadir}/%{tizennetdir}/*.dll
%endif
%changelog