From 172f51b071494137d59fb49f80629cc00c95d7fa Mon Sep 17 00:00:00 2001 From: "hk57.kim" Date: Thu, 9 Feb 2017 10:45:02 +0900 Subject: [PATCH] [4.0] Fix : make build extension-TM1 only for arm - This is for Tizen 4.0 - Provide extension-TM1 only for arm. Change-Id: I5ef06b6e3aea46ec597d66324a7f93e9da25a984 Signed-off-by: hk57.kim --- packaging/mobileap-agent.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/packaging/mobileap-agent.spec b/packaging/mobileap-agent.spec index 6093b62..75d48bf 100644 --- a/packaging/mobileap-agent.spec +++ b/packaging/mobileap-agent.spec @@ -37,11 +37,13 @@ Requires: dnsmasq %description Mobile AP daemon for setting tethering environments +%ifarch %{arm} %package extension-TM1 Summary: Extension for mobile TM1 -Requires: %{name}=%{version} +Requires: %{name} = %{version}-%{release} %description extension-TM1 Mobile AP daemon for setting tethering environments for mobile TM1 +%endif %prep %setup -q @@ -52,6 +54,7 @@ export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE" export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE" export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" +%ifarch %{arm} # Build for TM1 %cmake -DCMAKE_BUILD_TYPE="" \ -DTIZEN_FEATURE_MULTICAST=1 \ @@ -62,6 +65,7 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" mv %{buildroot}%{_bindir}/mobileap-agent %{_builddir}/%{name}-%{version}/mobileap-agent.tm1 make %{?jobs:-j%jobs} +%endif # Build for non-TM1 %cmake -DCMAKE_BUILD_TYPE="" \ @@ -73,7 +77,9 @@ make %{?jobs:-j%jobs} %install %make_install +%ifarch %{arm} mv %{_builddir}/%{name}-%{version}/mobileap-agent.tm1 %{buildroot}%{_bindir} +%endif mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d cp mobileap-agent.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d/mobileap-agent.conf @@ -90,12 +96,14 @@ cp %{SOURCE2} %{buildroot}%{_datadir}/dbus-1/system-services/org.tizen.MobileapA /bin/chmod +x /opt/etc/dump.d/module.d/tethering_dump.sh #/usr/sbin/setcap cap_dac_override,cap_fowner,cap_net_bind_service,cap_net_admin+eip /usr/bin/mobileap-agent +%ifarch %{arm} %post extension-TM1 pushd %{_bindir} mv mobileap-agent.tm1 mobileap-agent popd %preun extension-TM1 rm %{_bindir}/mobileap-agent +%endif %files %manifest mobileap-agent.manifest @@ -109,7 +117,9 @@ rm %{_bindir}/mobileap-agent %{_bindir}/mobileap-agent /opt/etc/dump.d/module.d/tethering_dump.sh +%ifarch %{arm} %files extension-TM1 %defattr(-,root,root,-) %{_bindir}/mobileap-agent.tm1 +%endif -- 2.7.4