From 98b721d34dc79807065f419cb8b4ebb390b4347b Mon Sep 17 00:00:00 2001 From: "hk57.kim" Date: Wed, 29 Mar 2017 09:51:20 +0900 Subject: [PATCH] [Tizen] Remove emulator build dependencies - This is for Tizen 4.0. - Added backward-compatibility that does not deteriorate 4.0 Configurability - When you SR this, you need to create JIRA-TRE issue of: : add sdbd-extension-emulator for common/mobile/wearable/ivi emulator : add sdbd-extension-tv-emulator for tv emulator (It's add, not replace.) Change-Id: Ifc620fd9d83d7a8d56241064832768697c08b058 Signed-off-by: hk57.kim --- CMakeLists.txt | 6 ------ packaging/sdbd.spec | 60 ++++++++++++++++++++++++++++++++++++----------------- 2 files changed, 41 insertions(+), 25 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 64c56f9..e06a26d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,12 +96,6 @@ IF (_ARM_TARGET) ADD_DEFINITIONS("-DANDROID_GADGET=1") ENDIF (_ARM_TARGET) -IF(TARGET_ARCH STREQUAL x86) - ADD_DEFINITIONS("-DTARGET_ARCH_X86") -ELSE() - ADD_DEFINITIONS("-DTARGET_ARCH_ARM") -ENDIF() - IF(WEARABLE_PROFILE STREQUAL on) ADD_DEFINITIONS("-D_WEARABLE") ENDIF() diff --git a/packaging/sdbd.spec b/packaging/sdbd.spec index 1b4eafc..0db14fa 100644 --- a/packaging/sdbd.spec +++ b/packaging/sdbd.spec @@ -42,6 +42,20 @@ Requires: %{name} = %{version}-%{release} SDB daemon extension for TV. This changes the service unit files of the default SDB daemon service files. +%ifarch %{ix86} x86_64 +%package extension-emulator +Summary: SDB daemon for emulator +Requires: %{name} = %{version}-%{release} +%description extension-emulator +SDB daemon for emulator + +%package extension-tv-emulator +Summary: SDB daemon for tv emulator +Requires: %{name}-profile_tv = %{version}-%{release} +%description extension-tv-emulator +SDB daemon for tv emulator +%endif // ifarch %{ix86} x86_64 + %package -n sdbd-devel Summary: SDBD plugin API Group: Development/Libraries @@ -55,32 +69,25 @@ cp %{SOURCE1003} . %build -# DO YOU REALLY SURE THAT x86 is never going to be non-emulator? -%if %{with emulator} -%define target_arch x86 -%else -%define target_arch arm -%endif - cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DTARGET_ARCH=%{target_arch} make %{?jobs:-j%jobs} %install mkdir -p %{buildroot}/usr/share/license cp LICENSE %{buildroot}/usr/share/license/%{name} - -%make_install mkdir -p %{buildroot}%{_unitdir} -%if %{with emulator} -install -m 0644 %SOURCE1006 %{buildroot}%{_unitdir}/sdbd.service.tv -install -m 0644 %SOURCE1002 %{buildroot}%{_unitdir}/sdbd.service +# extension-*-emulator +%ifarch %{ix86} x86_64 +install -m 0644 %SOURCE1006 %{buildroot}%{_unitdir}/sdbd.service.tv.emulator +install -m 0644 %SOURCE1002 %{buildroot}%{_unitdir}/sdbd.service.emulator mkdir -p %{buildroot}/%{_unitdir}/emulator_preinit.target.wants ln -s %{_unitdir}/sdbd.service %{buildroot}/%{_unitdir}/emulator_preinit.target.wants/ +%endif // ifarch %{ix86} x86_64 + +%make_install -%else install -m 0644 %SOURCE1005 %{buildroot}%{_unitdir}/sdbd.service.tv install -m 0644 %SOURCE1001 %{buildroot}%{_unitdir}/sdbd.service install -m 0644 %SOURCE1004 %{buildroot}%{_unitdir}/sdbd_tcp.service @@ -89,7 +96,6 @@ ln -s %{_unitdir}/sdbd.service %{buildroot}/%{_unitdir}/multi-user.target.wants/ mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d/ install -m 644 rules/99-sdbd.rules %{buildroot}%{_prefix}/lib/udev/rules.d/ -%endif mkdir -p %{buildroot}%{_prefix}/sbin install -m 755 script/sdk_launch %{buildroot}%{_prefix}/sbin/ @@ -126,16 +132,32 @@ chsmack -e "User::Shell" /sbin/sdbd-user %{_prefix}/sbin/sdk_launch %attr(0755, root, root) %{_sysconfdir}/init.d/sdbd %{_unitdir}/sdbd.service -%if %{with emulator} -%{_unitdir}/emulator_preinit.target.wants/sdbd.service -%else %{_unitdir}/sdbd_tcp.service %{_unitdir}/multi-user.target.wants/sdbd.service %{_prefix}/lib/udev/rules.d/99-sdbd.rules -%endif /usr/share/license/%{name} %{TZ_SYS_BIN}/profile_command +%ifarch %{ix86} x86_64 +%post extension-emulator +mv %{_unitdir}/sdbd.service.emulator %{_unitdir}/sdbd.service +%preun extension-emulator +mv %{_unitdir}/sdbd.service %{_unitdir}/sdbd.service.emulator +%files extension-emulator +%manifest sdbd.manifest +%{_unitdir}/sdbd.service.emulator +%{_unitdir}/emulator_preinit.target.wants/sdbd.service + +%post extension-tv-emulator +mv %{_unitdir}/sdbd.service.tv.emulator %{_unitdir}/sdbd.service +%preun extension-tv-emulator +mv %{_unitdir}/sdbd.service %{_unitdir}/sdbd.service.tv.emulator +%files extension-tv-emulator +%manifest sdbd.manifest +%{_unitdir}/sdbd.service.tv.emulator +%{_unitdir}/emulator_preinit.target.wants/sdbd.service +%endif // ifarch %{ix86} x86_64 + %post profile_tv pushd {%_unitdir} mv sdbd.service.tv sdbd.service -- 2.7.4