Fix build error for i586 and x86_64

Change-Id: I71d38043a401ca3009a3c661ea0526a239bd860a
Signed-off-by: Jaehyun Kim <jeik01.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5646be..45a66fb 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,7 +144,9 @@ ADD_SUBDIRECTORY(plugin/headed)
 ADD_SUBDIRECTORY(plugin/telephony)
 ADD_SUBDIRECTORY(plugin/stc)
 ADD_SUBDIRECTORY(plugin/battery)
+IF(TIZEN_ARM_ARCH)
 ADD_SUBDIRECTORY(plugin/online-monitor)
+ENDIF(TIZEN_ARM_ARCH)
 ADD_SUBDIRECTORY(haltests)
 IF(BUILD_GTESTS)
        ADD_SUBDIRECTORY(gtest)

diff --git a/packaging/net-config.spec b/packaging/net-config.spec
index c5fcbf8..ad4cf82 100755 (executable)
--- a/packaging/net-config.spec
+++ b/packaging/net-config.spec
@@ -97,6 +97,7 @@ Requires:       %{name} = %{version}-%{release}
 %description haltests
 TIZEN Network Configuration service extension for HAL test.
 
+%ifarch arm armv7l aarch64
 %package plugin-online-monitor
 Summary:        net-config extension for advanced online monitoring
 BuildRequires:  connman-extension-bpf-devel
@@ -105,6 +106,7 @@ Requires:       connman-extension-bpf
 Requires:       %{name} = %{version}-%{release}
 %description plugin-online-monitor
 TIZEN Network Configuration service extension for advanced online monitoring.
+%endif
 
 %prep
 %setup -q
@@ -120,6 +122,9 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
 %if "%{?_lib}" == "lib64"
        -DTIZEN_ARCH_64=1 \
 %endif
+%ifarch arm armv7l aarch64
+       -DTIZEN_ARM_ARCH=1 \
+%endif
        -DLIB_PATH=%{_lib} \
        -DBIN_DIR=%{_bindir} \
        -DBUILD_GTESTS=%{?gtests:1}%{!?gtests:0} \
@@ -196,10 +201,12 @@ cp resources/usr/system/RestoreDir/softreset/network_softreset.sh %{buildroot}/u
 
 mv %{_builddir}/%{name}-%{version}/net-config.wearable %{buildroot}%{_bindir}
 
+%ifarch arm armv7l aarch64
 #online-monitor
 cp plugin/online-monitor/online_monitor.conf %{buildroot}/%{_localstatedir}/lib/net-config
 cp plugin/online-monitor/common_info_dump.sh %{buildroot}/opt/var/lib/net-config/
 cp plugin/online-monitor/supp_log_dump.sh %{buildroot}/opt/var/lib/net-config/
+%endif
 
 %post
 chsmack -a 'System::Shared' %{_sysconfdir}/resolv.conf
@@ -288,6 +295,7 @@ mv /var/lib/net-config/settings-robot /var/lib/net-config/settings
 %manifest net-config.manifest
 %{_bindir}/hal/*haltests
 
+%ifarch arm armv7l aarch64
 %files plugin-online-monitor
 %manifest net-config.manifest
 %attr(500,network_fw,network_fw) %{_libdir}/net-config-plugin-online-monitor.so
@@ -297,3 +305,4 @@ mv /var/lib/net-config/settings-robot /var/lib/net-config/settings
 
 %post plugin-online-monitor
 /usr/bin/mkdir -p /opt/usr/data/network/online_mon
+%endif