From: shingil.kang Date: Tue, 9 Aug 2016 08:49:14 +0000 (+0900) Subject: Fixed the build problem for emulator 64 bit architecture. X-Git-Tag: submit/tizen/20160809.094042^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4523b8e3c98535323865e17d6d53ae183d04b7c3;p=sdk%2Ftarget%2Fsdbd.git Fixed the build problem for emulator 64 bit architecture. - modified the way which determines device type (emulator or target) Change-Id: I1742336fcf128649362d4b855777fa6312636b8d Signed-off-by: shingil.kang --- diff --git a/packaging/sdbd.spec b/packaging/sdbd.spec index e8539f8..a880c80 100644 --- a/packaging/sdbd.spec +++ b/packaging/sdbd.spec @@ -2,7 +2,7 @@ Name: sdbd Summary: SDB daemon -Version: 3.0.12 +Version: 3.0.13 Release: 0 License: Apache-2.0 Summary: SDB daemon @@ -41,7 +41,7 @@ cp %{SOURCE1003} . %else %define wearable_profile off %endif -%ifarch %{ix86} +%if %{with emulator} %define target_arch x86 %else %define target_arch arm @@ -57,17 +57,16 @@ mkdir -p %{buildroot}/usr/share/license cp LICENSE %{buildroot}/usr/share/license/%{name} %make_install -mkdir -p %{buildroot}%{_libdir}/systemd/system mkdir -p %{buildroot}%{_unitdir} -%ifarch %{ix86} +%if %{with emulator} %if "%{profile}" == "tv" -install -m 0644 %SOURCE1006 %{buildroot}%{_libdir}/systemd/system/sdbd.service +install -m 0644 %SOURCE1006 %{buildroot}%{_unitdir}/sdbd.service %else -install -m 0644 %SOURCE1002 %{buildroot}%{_libdir}/systemd/system/sdbd.service +install -m 0644 %SOURCE1002 %{buildroot}%{_unitdir}/sdbd.service %endif -mkdir -p %{buildroot}/%{_libdir}/systemd/system/emulator_preinit.target.wants -ln -s %{_libdir}/systemd/system/sdbd.service %{buildroot}/%{_libdir}/systemd/system/emulator_preinit.target.wants/ +mkdir -p %{buildroot}/%{_unitdir}/emulator_preinit.target.wants +ln -s %{_unitdir}/sdbd.service %{buildroot}/%{_unitdir}/emulator_preinit.target.wants/ %else %if "%{profile}" == "tv" @@ -76,8 +75,8 @@ install -m 0644 %SOURCE1005 %{buildroot}%{_unitdir}/sdbd.service install -m 0644 %SOURCE1001 %{buildroot}%{_unitdir}/sdbd.service %endif install -m 0644 %SOURCE1004 %{buildroot}%{_unitdir}/sdbd_tcp.service -mkdir -p %{buildroot}/%{_libdir}/systemd/system/multi-user.target.wants -ln -s %{_libdir}/systemd/system/sdbd.service %{buildroot}/%{_libdir}/systemd/system/multi-user.target.wants/ +mkdir -p %{buildroot}/%{_unitdir}/multi-user.target.wants +ln -s %{_unitdir}/sdbd.service %{buildroot}/%{_unitdir}/multi-user.target.wants/ %endif mkdir -p %{buildroot}%{_prefix}/sbin @@ -105,11 +104,11 @@ fi %{_prefix}/sbin/sdk_launch %attr(0755, root, root) %{_sysconfdir}/init.d/sdbd %{_unitdir}/sdbd.service -%ifarch %{ix86} -%{_libdir}/systemd/system/emulator_preinit.target.wants/sdbd.service +%if %{with emulator} +%{_unitdir}/emulator_preinit.target.wants/sdbd.service %else %{_unitdir}/sdbd_tcp.service -%{_libdir}/systemd/system/multi-user.target.wants/sdbd.service +%{_unitdir}/multi-user.target.wants/sdbd.service %endif /usr/share/license/%{name} %{TZ_SYS_BIN}/profile_command