summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInkyun Kil <inkyun.kil@samsung.com>2019-10-30 00:54:26 (GMT)
committerInkyun Kil <inkyun.kil@samsung.com>2019-10-30 00:54:26 (GMT)
commita9d15757d851a99ef8b8c05da63b469aa04f2150 (patch)
treed90fbf384a41e2606b9af2328d116f19968aa2d3
parent973075301e5077f8148d8b1fc7e5354d77dcf00b (diff)
downloadalarm-manager-a9d15757d851a99ef8b8c05da63b469aa04f2150.zip
alarm-manager-a9d15757d851a99ef8b8c05da63b469aa04f2150.tar.gz
alarm-manager-a9d15757d851a99ef8b8c05da63b469aa04f2150.tar.bz2
This is for reverting "tizen: Add additional unit for "unified" userrefs/changes/31/216631/1
session" There was code duplication in the process of merging code Change-Id: I67c2d5f746e41a7a67bfc137302b40dd6da0e2f4 Signed-off-by: Inkyun Kil <inkyun.kil@samsung.com>
-rw-r--r--packaging/alarm-manager.spec15
-rwxr-xr-xpackaging/alarm-session-agent@.service13
-rwxr-xr-xpackaging/alarm-session-agent@.socket13
3 files changed, 4 insertions, 37 deletions
diff --git a/packaging/alarm-manager.spec b/packaging/alarm-manager.spec
index 07f5a3f..17a3e7a 100644
--- a/packaging/alarm-manager.spec
+++ b/packaging/alarm-manager.spec
@@ -10,10 +10,11 @@ Source2: alarm-session-agent.service
Source3: alarm-session-agent.socket
Source4: alarm-manager.conf
Source5: 99-rtc.rules
-Source6: alarm-session-agent@.service
-Source7: alarm-session-agent@.socket
Source1001: alarm-server.manifest
Source1002: alarm-lib.manifest
+Requires(post): /sbin/ldconfig
+Requires(postun): /sbin/ldconfig
+
BuildRequires: cmake
BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(dlog)
@@ -139,7 +140,6 @@ Alarm library gcov objects
cp %{SOURCE1001} ./
cp %{SOURCE1002} ./
-
%build
%if 0%{?gcov:1}
export CFLAGS+=" -fprofile-arcs -ftest-coverage"
@@ -176,15 +176,11 @@ rm -rf %{buildroot}
mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
mkdir -p %{buildroot}%{_unitdir_user}/sockets.target.wants
-mkdir -p %{buildroot}%{_unitdir}/user-sockets@.target.wants
install -m 0644 %SOURCE1 %{buildroot}%{_unitdir}/alarm-server.service
install -m 0644 %SOURCE2 %{buildroot}%{_unitdir_user}/alarm-session-agent.service
install -m 0644 %SOURCE3 %{buildroot}%{_unitdir_user}/alarm-session-agent.socket
-install -m 0644 %SOURCE6 %{buildroot}%{_unitdir}/alarm-session-agent@.service
-install -m 0644 %SOURCE7 %{buildroot}%{_unitdir}/alarm-session-agent@.socket
ln -s ../alarm-server.service %{buildroot}%{_unitdir}/multi-user.target.wants/alarm-server.service
ln -sf ../alarm-session-agent.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/alarm-session-agent.socket
-ln -sf ../alarm-session-agent@.socket %{buildroot}%{_unitdir}/user-sockets@.target.wants/alarm-session-agent@.socket
mkdir -p %{buildroot}%{_tmpfilesdir}
install -m 0644 %SOURCE4 %{buildroot}%{_tmpfilesdir}/alarm-manager.conf
mkdir -p %{buildroot}%{_libdir}/udev/rules.d
@@ -232,15 +228,12 @@ fi
%{_unitdir}/multi-user.target.wants/alarm-server.service
%{_unitdir_user}/alarm-session-agent.service
%{_unitdir_user}/alarm-session-agent.socket
-%{_unitdir}/alarm-session-agent@.service
-%{_unitdir}/alarm-session-agent@.socket
%{_unitdir_user}/sockets.target.wants/alarm-session-agent.socket
-%{_unitdir}/user-sockets@.target.wants/alarm-session-agent@.socket
%attr(0644,root,root) %{_datadir}/dbus-1/system-services/org.tizen.alarm.manager.service
+%license LICENSE
%config %{_sysconfdir}/dbus-1/system.d/alarm-service.conf
%{_tmpfilesdir}/alarm-manager.conf
%{_libdir}/udev/rules.d/99-rtc.rules
-%license LICENSE
%if 0%{?appfw_feature_alarm_manager_module_log}
%attr(0755,root,root) %{TZ_SYS_ETC}/dump.d/module.d/alarmmgr_log_dump.sh
%attr(0755,app_fw,app_fw) %{logdir}
diff --git a/packaging/alarm-session-agent@.service b/packaging/alarm-session-agent@.service
deleted file mode 100755
index a4eb6ac..0000000
--- a/packaging/alarm-session-agent@.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-Description=Start the alarm agent
-
-[Service]
-User=%i
-Environment=DBUS_SESSION_BUS_ADDRESS=kernel:path=/sys/fs/kdbus/%i-user/bus;unix:path=/run/user/%i/bus
-Environment=XDG_RUNTIME_DIR=/run/user/%i
-SmackProcessLabel=User
-ExecStart=/usr/bin/alarm_session_agent
-
-[Install]
-WantedBy=user-default@.target
diff --git a/packaging/alarm-session-agent@.socket b/packaging/alarm-session-agent@.socket
deleted file mode 100755
index 34f2bea..0000000
--- a/packaging/alarm-session-agent@.socket
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-DefaultDependencies=no
-After=systemd-logind.service
-
-[Socket]
-SocketUser=%i
-ListenStream=/run/alarm_agent/%i
-DirectoryMode=0777
-ExecStartPost=/usr/bin/chmod 0777 /run/alarm_agent/%i
-
-[Install]
-WantedBy=user-sockets@.target