From 5b63917401da89bd96501af33ca664f0a8270aa6 Mon Sep 17 00:00:00 2001 From: Yunmi Ha Date: Thu, 1 Sep 2016 12:39:59 +0900 Subject: [PATCH] Update: Not install gumd.service file with TV profile. gumd.service file istallation was failed cause of security policy. So when build TV profile, package doesn't install gumd.service. And gumd will works as dbus service. Change-Id: I35bcc43f3c9f8e93515bb072b4e020d348db6d2b Signed-off-by: Yunmi Ha --- packaging/gumd.spec | 11 +++++++++++ ...org.O1.SecurityAccounts.gUserManagement.service.common.in} | 0 .../org.O1.SecurityAccounts.gUserManagement.service.vd.in | 4 ++++ 3 files changed, 15 insertions(+) rename src/daemon/dbus/services/{org.O1.SecurityAccounts.gUserManagement.service.in => org.O1.SecurityAccounts.gUserManagement.service.common.in} (100%) create mode 100644 src/daemon/dbus/services/org.O1.SecurityAccounts.gUserManagement.service.vd.in diff --git a/packaging/gumd.spec b/packaging/gumd.spec index 40da7ea..ff56467 100644 --- a/packaging/gumd.spec +++ b/packaging/gumd.spec @@ -10,6 +10,7 @@ %define disable_cap_admin 0 %endif +%define GUMD_DBUS_SERVICE "src/daemon/dbus/services/org.O1.SecurityAccounts.gUserManagement.service" Name: gumd Summary: User management daemon and client library @@ -87,12 +88,18 @@ Requires: libgum = %{version}-%{release} %setup -q -n %{name}-%{version} cp -a %{SOURCE1001} %{name}.manifest cp -a %{SOURCE1002} libgum.manifest + +%if "%{TIZEN_PRODUCT_TV}" == "1" +mv "%{GUMD_DBUS_SERVICE}".vd.in "%{GUMD_DBUS_SERVICE}".in +%else +mv "%{GUMD_DBUS_SERVICE}".common.in "%{GUMD_DBUS_SERVICE}".in %if %{disable_cap_admin} == 1 echo "CapabilityBoundingSet=~CAP_MAC_ADMIN" >> data/gumd.service echo "SmackProcessLabel=System" >> data/gumd.service %else echo "SmackProcessLabel=System::Privileged" >> data/gumd.service %endif +%endif %build autoreconf -ivf @@ -109,8 +116,10 @@ rm -rf %{buildroot} rm -f %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf install -m 755 -d %{buildroot}%{_sysconfdir}/%{name} install -m 644 data/tizen/etc/%{name}/%{name}-tizen-common.conf %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf +%if "%{TIZEN_PRODUCT_TV}" != "1" install -m 755 -d %{buildroot}%{_unitdir} install -m 644 data/gumd.service %{buildroot}%{_unitdir} +%endif %post ldconfig @@ -159,8 +168,10 @@ install -d -m 755 %{_localstatedir}/lib/%{name}/user %dir %{_sysconfdir}/dbus-1 %dir %{_sysconfdir}/dbus-1/system.d %config(noreplace) %{_sysconfdir}/dbus-1/system.d/gumd-dbus.conf +%if "%{TIZEN_PRODUCT_TV}" != "1" %{_unitdir}/gumd.service %endif +%endif %files doc %defattr(-,root,root,-) diff --git a/src/daemon/dbus/services/org.O1.SecurityAccounts.gUserManagement.service.in b/src/daemon/dbus/services/org.O1.SecurityAccounts.gUserManagement.service.common.in similarity index 100% rename from src/daemon/dbus/services/org.O1.SecurityAccounts.gUserManagement.service.in rename to src/daemon/dbus/services/org.O1.SecurityAccounts.gUserManagement.service.common.in diff --git a/src/daemon/dbus/services/org.O1.SecurityAccounts.gUserManagement.service.vd.in b/src/daemon/dbus/services/org.O1.SecurityAccounts.gUserManagement.service.vd.in new file mode 100644 index 0000000..02fb552 --- /dev/null +++ b/src/daemon/dbus/services/org.O1.SecurityAccounts.gUserManagement.service.vd.in @@ -0,0 +1,4 @@ +[D-BUS Service] +Name=org.O1.SecurityAccounts.gUserManagement +Exec=@prefix@/bin/gumd +@MESSAGE_BUS_USER@ -- 2.7.4