From: Yunmi Ha <yunmi.ha@samsung.com>
Date: Thu, 22 Aug 2019 02:41:23 +0000 (+0900)
Subject: Revert "tizen: Add additional unit for "unified" user session"
X-Git-Tag: accepted/tizen/unified/20190828.011051^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F83%2F212483%2F1;p=platform%2Fcore%2Fuifw%2Flibtbm.git

Revert "tizen: Add additional unit for "unified" user session"

This reverts commit 9a9ec72dffc26405e5770368f782748bf6f8130c.

We've optimized systemd-user without unified system/session.
So, we revert the patch for unified system/session.

Change-Id: I54bc7246f3b675674e0cd86c883ffb4defac5498
Signed-off-by: Yunmi Ha <yunmi.ha@samsung.com>
---

diff --git a/packaging/libtbm.spec b/packaging/libtbm.spec
index afbf7d6..5f10ce3 100644
--- a/packaging/libtbm.spec
+++ b/packaging/libtbm.spec
@@ -100,10 +100,6 @@ rm -rf %{buildroot}
 install -m 644 service/tbm-drm-auth-user.service %{buildroot}%{_unitdir_user}
 install -m 644 service/tbm-drm-auth-user.path %{buildroot}%{_unitdir_user}
 
-%__mkdir_p %{buildroot}%{_unitdir}
-install -m 644 service/tbm-drm-auth-user@.service %{buildroot}%{_unitdir}
-install -m 644 service/tbm-drm-auth-user@.path %{buildroot}%{_unitdir}
-
 %if 0%{?gcov:1}
 mkdir -p %{buildroot}%{_datadir}/gcov/obj
 install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj
@@ -116,13 +112,9 @@ rm -rf %{buildroot}
 %__mkdir_p %{_unitdir_user}/basic.target.wants
 ln -sf ../tbm-drm-auth-user.path %{_unitdir_user}/basic.target.wants/
 
-%__mkdir_p %{_unitdir}/user-basic@.target.wants
-ln -sf ../tbm-drm-auth-user@.path %{_unitdir}/user-basic@.target.wants/
-
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 rm -f %{_unitdir_user}/basic.target.wants/tbm-drm-auth-user.path
-rm -f %{_unitdir}/user-basic@.target.wants/tbm-drm-auth-user@.path
 
 %files
 %manifest %{name}.manifest
@@ -131,8 +123,6 @@ rm -f %{_unitdir}/user-basic@.target.wants/tbm-drm-auth-user@.path
 %{_libdir}/libtbm.so.*
 %{_unitdir_user}/tbm-drm-auth-user.path
 %{_unitdir_user}/tbm-drm-auth-user.service
-%{_unitdir}/tbm-drm-auth-user@.path
-%{_unitdir}/tbm-drm-auth-user@.service
 
 %files devel
 %manifest %{name}.manifest
diff --git a/service/tbm-drm-auth-user@.path b/service/tbm-drm-auth-user@.path
deleted file mode 100644
index fac8959..0000000
--- a/service/tbm-drm-auth-user@.path
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-DefaultDependencies=no
-After=systemd-logind.service
-Description=Wait for tbm-drm-auth display daemon socket
-
-[Path]
-PathExists=/run/tbm-drm-auth
diff --git a/service/tbm-drm-auth-user@.service b/service/tbm-drm-auth-user@.service
deleted file mode 100644
index 6c3d40e..0000000
--- a/service/tbm-drm-auth-user@.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-Description=Creating a link file for user to access tbm-drm-auth
-DefaultDependencies=no
-Before=starter@%i.service
-
-[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
-Type=oneshot
-ExecStart=/usr/bin/sh -c "while [ ! -e /run/tbm-drm-auth ] ; do /usr/bin/sleep .1 ; done ;/usr/bin/ln -s /run/tbm-drm-auth /run/user/%i/"