summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiyoung Yun <jy910.yun@samsung.com>2017-01-02 01:33:58 (GMT)
committerJiyoung Yun <jy910.yun@samsung.com>2017-01-02 01:39:23 (GMT)
commit51ea044c055541b2237f76857f1b8831bfd919f8 (patch)
treed97eb326e07d3bf0870aae194749aecc784a5c36
parentc1237f032bcd2928955a87a4ff3b7f262b8dd6bc (diff)
downloadcoreclr-51ea044c055541b2237f76857f1b8831bfd919f8.zip
coreclr-51ea044c055541b2237f76857f1b8831bfd919f8.tar.gz
coreclr-51ea044c055541b2237f76857f1b8831bfd919f8.tar.bz2
This reverts commit c1237f032bcd2928955a87a4ff3b7f262b8dd6bc. Change-Id: I0022a95285fa28651a1d8ff4889ed7fff967e66e
-rw-r--r--packaging/coreclr.spec120
1 files changed, 68 insertions, 52 deletions
diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec
index 2f73431..b04560e 100644
--- a/packaging/coreclr.spec
+++ b/packaging/coreclr.spec
@@ -249,100 +249,116 @@ echo %{CORECLR_GIT_HASH} > .clrinfo
%define dotnetdir dotnet
%define netshareddir %{dotnetdir}/shared
%define netcoreappdir %{netshareddir}/Microsoft.NETCore.App/%{dotnet_version}
-mkdir -p %{buildroot}%{_datadir}/%{netcoreappdir}
+mkdir -p %{buildroot}/opt/usr/share/%{netcoreappdir}
# .NET Tizen Runtime
%define dotnettizendir dotnet.tizen
%define dotnetfwdir %{dotnettizendir}/framework
%define dotnettestdir %{dotnettizendir}/test
-mkdir -p %{buildroot}%{_datadir}/%{dotnetfwdir}
-mkdir -p %{buildroot}%{_datadir}/%{dotnettestdir}
+mkdir -p %{buildroot}/opt/usr/share/%{dotnettizendir}
+mkdir -p %{buildroot}/opt/usr/share/%{dotnetfwdir}
+mkdir -p %{buildroot}/opt/usr/share/%{dotnettestdir}
-# .NET CoreOverlay
+# .NET & Mono CoreOverlay
%define tizennetdir tizen.net
-mkdir -p %{buildroot}%{_datadir}/%{tizennetdir}
+%define tizenmonodir tizen.mono
+mkdir -p %{buildroot}/opt/usr/share/%{tizennetdir}
+mkdir -p %{buildroot}/opt/usr/share/%{tizenmonodir}
%if 0%{skipnative}
%else
-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
+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
# make link for .NET CoreOverlay
-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}
+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}
# extra
-cp %{_reldir}/coreconsole %{buildroot}%{_datadir}/%{dotnetfwdir}
-cp %{_reldir}/crossgen %{buildroot}%{_datadir}/%{dotnetfwdir}
-cp %{_reldir}/ilasm %{buildroot}%{_datadir}/%{dotnetfwdir}
-cp %{_reldir}/ildasm %{buildroot}%{_datadir}/%{dotnetfwdir}
+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}
# test
-cp -rf bin/obj/Linux.%{_barch}.%{_buildtype}/tests/src %{buildroot}%{_datadir}/%{dotnettestdir}
+cp -rf bin/obj/Linux.%{_barch}.%{_buildtype}/tests/src %{buildroot}/opt/usr/share/%{dotnettestdir}
-cp -rf .clrinfo %{buildroot}%{_datadir}/%{tizennetdir}
+# 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}
%endif
%if 0%{skipmscorlib}
%else
-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}
+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}
# make link for .NET CoreOverlay
-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}
+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}
%endif
%if 0%{skipnative}
%else
%files
%manifest %{name}.manifest
-%dir %{_datadir}/%{netcoreappdir}
+%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}/%{tizennetdir}
-%{_datadir}/%{netcoreappdir}/corerun
-%{_datadir}/%{netcoreappdir}/*.so
-%{_datadir}/%{tizennetdir}/*
-%{_datadir}/%{tizennetdir}/.clrinfo
-%{_datadir}/%{dotnetdir}/corerun
%files extra
%manifest %{name}.manifest
-%dir %{_datadir}/%{dotnetfwdir}
-%{_datadir}/%{dotnetfwdir}/*
+%dir /opt/usr/share/%{dotnetfwdir}
+/opt/usr/share/%{dotnetfwdir}/*
%files test
%manifest %{name}.manifest
-%dir %{_datadir}/%{dotnettestdir}
-%{_datadir}/%{dotnettestdir}/*
+%dir /opt/usr/share/%{dotnettestdir}
+/opt/usr/share/%{dotnettestdir}/*
%endif
%if 0%{skipmscorlib}
%else
%files -n mscorlib
%manifest %{name}.manifest
-%{_datadir}/%{netcoreappdir}/*.dll
-%{_datadir}/%{tizennetdir}/*.dll
+%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
%endif
%changelog