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

This reverts commit 6969613dc8659c1ae60b5841bb3b40bc77605d8f.

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

Change-Id: I953cc79bd1cdddb600692f5fd19960043716e7e9

diff --git a/configure.ac b/configure.ac
index 31e7f87..eafb272 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -29,8 +29,5 @@ AC_CONFIG_FILES([Makefile
             packaging/efl-config.service
             packaging/efl-config-post.service
             packaging/efl-config-ondemand.service
-            packaging/efl-config@.service
-            packaging/efl-config-post@.service
-            packaging/efl-config-ondemand@.service
             ])
 AC_OUTPUT

diff --git a/packaging/efl-config-ondemand@.service.in b/packaging/efl-config-ondemand@.service.in
deleted file mode 100644 (file)
index 5c2faf6..0000000
--- a/packaging/efl-config-ondemand@.service.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-Description=Change the efl configures.
-
-[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=@TZ_SYS_BIN@/efl_config --with-message
-EnvironmentFile=-/run/tizen-system-env

diff --git a/packaging/efl-config-post@.service.in b/packaging/efl-config-post@.service.in
deleted file mode 100644 (file)
index 97f89a1..0000000
--- a/packaging/efl-config-post@.service.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-Description=Change the efl configures.
-
-[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=@TZ_SYS_BIN@/efl_config
-EnvironmentFile=-/run/tizen-system-env

diff --git a/packaging/efl-config.spec b/packaging/efl-config.spec
index 368ceb3..23c6038 100644 (file)
--- a/packaging/efl-config.spec
+++ b/packaging/efl-config.spec
@@ -39,28 +39,16 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_unitdir_user}/basic.target.wants
 mkdir -p %{buildroot}%{_unitdir_user}/delayed.target.wants
 mkdir -p %{buildroot}%{_unitdir_user}/sockets.target.wants
-mkdir -p %{buildroot}%{_unitdir}/user-basic@.target.wants
-mkdir -p %{buildroot}%{_unitdir}/user-default@.target.wants
-mkdir -p %{buildroot}%{_unitdir}/user-sockets@.target.wants
 
 install -m 0644 %{_builddir}/%{name}-%{version}/packaging/%{alias}.service %{buildroot}%{_unitdir_user}/%{alias}.service
 install -m 0644 %{_builddir}/%{name}-%{version}/packaging/%{alias}-post.service %{buildroot}%{_unitdir_user}/%{alias}-post.service
 install -m 0644 %{_builddir}/%{name}-%{version}/packaging/%{alias}-ondemand.service %{buildroot}%{_unitdir_user}/%{alias}-ondemand.service
 install -m 0644 %{_builddir}/%{name}-%{version}/packaging/%{alias}.socket %{buildroot}%{_unitdir_user}/%{alias}.socket
 
-install -m 0644 %{_builddir}/%{name}-%{version}/packaging/%{alias}@.service %{buildroot}%{_unitdir}/%{alias}@.service
-install -m 0644 %{_builddir}/%{name}-%{version}/packaging/%{alias}-post@.service %{buildroot}%{_unitdir}/%{alias}-post@.service
-install -m 0644 %{_builddir}/%{name}-%{version}/packaging/%{alias}-ondemand@.service %{buildroot}%{_unitdir}/%{alias}-ondemand@.service
-install -m 0644 %{_builddir}/%{name}-%{version}/packaging/%{alias}@.socket %{buildroot}%{_unitdir}/%{alias}@.socket
-
 ln -s ../%{alias}.service %{buildroot}%{_unitdir_user}/basic.target.wants/%{alias}.service
 ln -s ../%{alias}-post.service %{buildroot}%{_unitdir_user}/delayed.target.wants/%{alias}-post.service
 ln -s ../%{alias}.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/%{alias}.socket
 
-ln -s ../%{alias}@.service %{buildroot}%{_unitdir}/user-basic@.target.wants/%{alias}@.service
-ln -s ../%{alias}-post@.service %{buildroot}%{_unitdir}/user-default@.target.wants/%{alias}-post@.service
-ln -s ../%{alias}@.socket %{buildroot}%{_unitdir}/user-sockets@.target.wants/%{alias}@.socket
-
 %post
 /sbin/ldconfig
 mkdir -p /opt/share/.elementary
@@ -73,8 +61,6 @@ chsmack -t /opt/share/.elementary
 /sbin/ldconfig
 rm -f %{buildroot}%{_unitdir_user}/basic.target.wants/%{alias}.service
 rm -f %{buildroot}%{_unitdir_user}/delayed.target.wants/%{alias}-post.service
-rm -f %{buildroot}%{_unitdir}/user-basic@.target.wants/%{alias}@.service
-rm -f %{buildroot}%{_unitdir}/user-default@.target.wants/%{alias}-post@.service
 
 %files
 %defattr(-,root,root,-)
@@ -86,11 +72,4 @@ rm -f %{buildroot}%{_unitdir}/user-default@.target.wants/%{alias}-post@.service
 %{_unitdir_user}/delayed.target.wants/%{alias}-post.service
 %{_unitdir_user}/sockets.target.wants/%{alias}.socket
 %{_unitdir_user}/%{alias}.socket
-%{_unitdir}/%{alias}@.service
-%{_unitdir}/%{alias}-post@.service
-%{_unitdir}/%{alias}-ondemand@.service
-%{_unitdir}/user-basic@.target.wants/%{alias}@.service
-%{_unitdir}/user-default@.target.wants/%{alias}-post@.service
-%{_unitdir}/user-sockets@.target.wants/%{alias}@.socket
-%{_unitdir}/%{alias}@.socket
 %manifest %{alias}.manifest

diff --git a/packaging/efl-config@.service.in b/packaging/efl-config@.service.in
deleted file mode 100644 (file)
index d2c7cb6..0000000
--- a/packaging/efl-config@.service.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-Description=Change the efl configures.
-DefaultDependencies=no
-Before=starter@%i.service
-After=enlightenment-user@%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
-RemainAfterExit=yes
-ExecStart=/usr/bin/sh -c "while [ ! -f /run/.wm_ready ] ; do /usr/bin/sleep .1 ; done ; exec /usr/bin/efl_config"
-EnvironmentFile=-/run/tizen-system-env

diff --git a/packaging/efl-config@.socket b/packaging/efl-config@.socket
deleted file mode 100644 (file)
index ab9f30b..0000000
--- a/packaging/efl-config@.socket
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-DefaultDependencies=no
-After=systemd-logind.service
-Description=EFL Config Service socket
-
-[Socket]
-SocketUser=%i
-ListenStream=/run/user/%i/system_share/.efl-config.sock
-Service=efl-config-ondemand@%i.service
-SocketMode=0777
-
-[Install]
-WantedBy=user-sockets@.target