[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 capi-system-info-extension-emulator for all(common/mobile/wearable/ivi/tv) emulator

(It's add, not replace.)

Change-Id: I8fcbd4760846ba03d9ea2adfbbb6117ab73e714e
Signed-off-by: hk57.kim <hk57.kim@samsung.com>
[Fix build error]
Signed-off-by: Kichan Kwon <k_c.kwon@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 657dbf18f8706c5a0ae550693a6ca75f2c9dc75a..5793d7a044eeafe877ad4b1b53e9200ea9ceaacf 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,9 +80,7 @@ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/system_info_intf.h DESTINATION
 
 ADD_SUBDIRECTORY(src/tizenid)
 ADD_SUBDIRECTORY(src/init_db)
-IF("${EMULATOR}" STREQUAL "on")
-       ADD_SUBDIRECTORY(src/update_db)
-ENDIF("${EMULATOR}" STREQUAL "on")
+ADD_SUBDIRECTORY(src/update_db)
 
 #Upgrade script
 CONFIGURE_FILE(

diff --git a/packaging/capi-system-info.spec b/packaging/capi-system-info.spec
index 959a0aa0d3e503d14a7fe9ecf8d4dd131236119b..75334ff646f9d54175d1c5df98427d9bfb0643a2 100644 (file)
--- a/packaging/capi-system-info.spec
+++ b/packaging/capi-system-info.spec
@@ -19,14 +19,19 @@ BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  gdbm-devel
-%if %{with emulator}
 BuildRequires:  glibc-devel-static
-%endif
 Requires: security-config
 Requires: %{config_file_path}
 
 %description
 
+%ifarch %{ix86} x86_64
+%package extension-emulator
+Summary:    A System Information library in Core API for emulator
+Requires:   %{name} = %{version}-%{release}
+%description extension-emulator
+A System Information library in Core API for emulator
+%endif // ifarch %{ix86} x86_64
 
 %package devel
 Summary:  A System Information library in Core API (Development)
@@ -40,12 +45,6 @@ Requires: %{name} = %{version}-%{release}
 %setup -q
 cp %{SOURCE1001} .
 
-%if %{with emulator}
-%define EMULATOR on
-%else
-%define EMULATOR off
-%endif
-
 %define info_file_path /etc/info.ini
 %define sysinfo_shared_path %{TZ_SYS_ETC}/sysinfo
 %define tizen_id_path %{sysinfo_shared_path}/tizenid
@@ -59,7 +58,6 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
                 -DINFO_FILE_PATH=%{info_file_path} \
                 -DMAJORVER=${MAJORVER} \
                 -DFULLVER=%{version} \
-                -DEMULATOR=%{EMULATOR} \
                 -DSHARED_PATH=%{sysinfo_shared_path} \
                 -DTIZEN_ID_PATH=%{tizen_id_path} \
                 -DDB_PATH=%{db_path} \
@@ -76,6 +74,10 @@ cp -f script/make_info_file.sh %{buildroot}/etc/make_info_file.sh
 
 mkdir -p %{buildroot}/%{sysinfo_shared_path}
 
+%ifnarch %{ix86} x86_64
+rm %{buildroot}/%{_bindir}/system_info_update_db
+%endif
+
 %post
 /usr/bin/chsmack -a "System::Shared" -t %{sysinfo_shared_path}
 /usr/bin/system_info_init_db
@@ -89,9 +91,11 @@ mkdir -p %{buildroot}/%{sysinfo_shared_path}
 %{_libdir}/libcapi-system-info.so.*
 %attr(0744,root,-) /etc/make_info_file.sh
 %{_bindir}/system_info_init_db
-%if %{with emulator}
+
+%ifarch %{ix86} x86_64
+%files extension-emulator
 %{_bindir}/system_info_update_db
-%endif
+%endif // ifarch %{ix86} x86_64
 
 #tizenid
 %attr(0775,root,system_share) %dir %{sysinfo_shared_path}