From a6b6517c9d512c627e30f3f7ed2d446135f48f23 Mon Sep 17 00:00:00 2001
From: Yunmi Ha <yunmi.ha@samsung.com>
Date: Tue, 20 Aug 2019 07:20:25 +0000
Subject: [PATCH] Revert "tizen: Add additional unit for "unified" user
 session"

This reverts commit 41452349d956d5c890f7a743c155600f8b091f63.

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

Change-Id: Ib7e2e358d26ec39c5907ccc6ef9458c382754b36
---
 packaging/csr-framework.spec  |  4 ----
 systemd/CMakeLists.txt        |  5 -----
 systemd/csr-popup@.service.in | 12 ------------
 systemd/csr-popup@.socket.in  | 16 ----------------
 4 files changed, 37 deletions(-)
 delete mode 100644 systemd/csr-popup@.service.in
 delete mode 100644 systemd/csr-popup@.socket.in

diff --git a/packaging/csr-framework.spec b/packaging/csr-framework.spec
index d50f6de..117fb5e 100644
--- a/packaging/csr-framework.spec
+++ b/packaging/csr-framework.spec
@@ -205,7 +205,6 @@ find . -name '*.gcno' -exec cp '{}' gcov-obj ';'
 %install_service sockets.target.wants %{service_name}-wp.socket
 %install_service sockets.target.wants %{service_name}-admin.socket
 %install_service ../user/sockets.target.wants %{service_name}-popup.socket
-%install_service ../system/user-sockets@.target.wants %{service_name}-popup@.socket
 
 mkdir -p %{buildroot}%{rw_db_dir}
 mkdir -p %{buildroot}%{ro_db_dir}
@@ -305,9 +304,6 @@ su - owner -c %{bin_dir}/%{service_name}-test
 %{popup_unitdir}/%{service_name}-popup.socket
 %{popup_unitdir}/sockets.target.wants/%{service_name}-popup.socket
 %{popup_unitdir}/%{service_name}-popup.service
-%{_unitdir}/%{service_name}-popup@.socket
-%{_unitdir}/user-sockets@.target.wants/%{service_name}-popup@.socket
-%{_unitdir}/%{service_name}-popup@.service
 %{ro_res_dir}/default-icon.png
 
 %dir %{ro_data_dir}/%{service_name}
diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index e4abaa3..01d8621 100644
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -20,17 +20,12 @@ CONFIGURE_FILE(${SERVICE_NAME}-admin.socket.in ${SERVICE_NAME}-admin.socket @ONL
 CONFIGURE_FILE(${SERVICE_NAME}-popup.service.in ${SERVICE_NAME}-popup.service @ONLY)
 CONFIGURE_FILE(${SERVICE_NAME}-popup.socket.in ${SERVICE_NAME}-popup.socket @ONLY)
 
-CONFIGURE_FILE(${SERVICE_NAME}-popup@.service.in ${SERVICE_NAME}-popup@.service @ONLY)
-CONFIGURE_FILE(${SERVICE_NAME}-popup@.socket.in ${SERVICE_NAME}-popup@.socket @ONLY)
-
 INSTALL(
 	FILES
 		${SERVICE_NAME}.service
 		${SERVICE_NAME}-cs.socket
 		${SERVICE_NAME}-wp.socket
 		${SERVICE_NAME}-admin.socket
-		${SERVICE_NAME}-popup@.service
-		${SERVICE_NAME}-popup@.socket
 	DESTINATION ${SYSTEMD_UNIT_DIR}
 )
 
diff --git a/systemd/csr-popup@.service.in b/systemd/csr-popup@.service.in
deleted file mode 100644
index fc4fe2e..0000000
--- a/systemd/csr-popup@.service.in
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-Description=CSR popup service for user session
-
-[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
-EnvironmentFile=@POPUP_SERVICE_ENV_FILE_PATH@
-ExecStart=@BIN_DIR@/@SERVICE_NAME@-popup
-Sockets=@SERVICE_NAME@-popup@%i.socket
diff --git a/systemd/csr-popup@.socket.in b/systemd/csr-popup@.socket.in
deleted file mode 100644
index aeba2fc..0000000
--- a/systemd/csr-popup@.socket.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-DefaultDependencies=no
-After=systemd-logind.service
-Description= Csr popup socket
-Wants=@SERVICE_NAME@-popup@%i.service
-Before=@SERVICE_NAME@-popup@%i.service
-
-[Socket]
-SocketUser=%i
-ListenStream=/tmp/.@SERVICE_NAME@-popup.socket
-Service=@SERVICE_NAME@-popup@%i.service
-SocketMode=0777
-
-[Install]
-WantedBy=user-sockets@.target
-- 
2.7.4