From bc4384bf6123b19bfb3273366dbfa12abb370ee0 Mon Sep 17 00:00:00 2001 From: Jiyoung Yun Date: Wed, 28 Dec 2016 16:53:25 +0900 Subject: Change dotnet install directory to %{_datadir} Change-Id: I4470efcd16795848d2b80f312657c3a622a9c473 Signed-off-by: Jiyoung Yun --- packaging/coreclr.spec | 120 +++++++++++++++++++++---------------------------- 1 file changed, 52 insertions(+), 68 deletions(-) (limited to 'packaging/coreclr.spec') diff --git a/packaging/coreclr.spec b/packaging/coreclr.spec index b04560efc6..2f7343179e 100644 --- a/packaging/coreclr.spec +++ b/packaging/coreclr.spec @@ -249,116 +249,100 @@ 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}/%{dotnetfwdir} +mkdir -p %{buildroot}%{_datadir}/%{dotnettestdir} -# .NET & Mono CoreOverlay +# .NET 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} +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 -- cgit v1.2.3