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

This reverts commit 2c86cedf39e3a08268e031f976c4568e8906201c.

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

Change-Id: I016dfa3a4d4635524f3228f92f74d517dabe86a5

diff --git a/packaging/pubkey-pinning.spec b/packaging/pubkey-pinning.spec
index b4dc91571551d728158c3540466b837f0392f433..e043c0f03feaaa4a1a23c7633cf32aae386c3eed 100644 (file)
--- a/packaging/pubkey-pinning.spec
+++ b/packaging/pubkey-pinning.spec
@@ -92,8 +92,7 @@ export LDFLAGS+="-Wl,--rpath=%_prefix/lib"
 %endif
         -DCXXABI=cxx11 \
         -DCMAKE_VERBOSE_MAKEFILE=ON \
-        -DSYSTEMD_UNIT_DIR=%_unitdir_user \
-        -DSYSTEMD_UNIT_SYSTEM_DIR=%_unitdir
+        -DSYSTEMD_UNIT_DIR=%_unitdir_user
 
 make %{?_smp_mflags}
 
@@ -116,10 +115,6 @@ pushd %{buildroot}%_unitdir_user/
 mv %name-popup.* %{_builddir}/%{name}-%{version}
 popd
 
-pushd %{buildroot}%_unitdir/
-mv %name-popup@.* %{_builddir}/%{name}-%{version}
-popd
-
 make clean
 
 %{!?build_type:%define build_type "Release"}
@@ -133,17 +128,14 @@ make clean
 %endif
         -DCXXABI=cxx03 \
         -DCMAKE_VERBOSE_MAKEFILE=ON \
-        -DSYSTEMD_UNIT_DIR=%_unitdir_user \
-        -DSYSTEMD_UNIT_SYSTEM_DIR=%_unitdir
+        -DSYSTEMD_UNIT_DIR=%_unitdir_user
 
 make %{?_smp_mflags}
 
 %install
 %make_install
 mkdir -p %buildroot%_unitdir_user/sockets.target.wants
-mkdir -p %buildroot%_unitdir/user-sockets@.target.wants
 ln -sf ../%name-popup-deprecated.socket %buildroot%_unitdir_user/sockets.target.wants/%name-popup-deprecated.socket
-ln -sf ../%name-popup-deprecated@.socket %buildroot%_unitdir/user-sockets@.target.wants/%name-popup-deprecated@.socket
 %find_lang pubkey-pinning
 
 #move all we have build for cxx11 abi
@@ -155,11 +147,8 @@ for FILE in tpkp-internal*; do mv "$FILE" "%{buildroot}%{_bindir}/$FILE"; done
 mv tpkp-popup %{buildroot}%{_bindir}
 mv %name-popup.socket  %{buildroot}%_unitdir_user
 mv %name-popup.service  %{buildroot}%_unitdir_user
-mv %name-popup@.socket  %{buildroot}%_unitdir
-mv %name-popup@.service  %{buildroot}%_unitdir
 mv tpkp*.pc %{buildroot}%{_libdir}/pkgconfig/
 ln -sf %_unitdir_user/%name-popup.socket %buildroot%_unitdir_user/sockets.target.wants/%name-popup.socket
-ln -sf %_unitdir/%name-popup@.socket %buildroot%_unitdir/user-sockets@.target.wants/%name-popup@.socket
 popd
 
 %post
@@ -222,9 +211,6 @@ systemctl daemon-reload
 %_unitdir_user/%name-popup-deprecated.service
 %_unitdir_user/%name-popup-deprecated.socket
 %_unitdir_user/sockets.target.wants/%name-popup-deprecated.socket
-%_unitdir/%name-popup-deprecated@.service
-%_unitdir/%name-popup-deprecated@.socket
-%_unitdir/user-sockets@.target.wants/%name-popup-deprecated@.socket
 %_bindir/tpkp-popup-deprecated
 
 %files -f pubkey-pinning.lang
@@ -241,9 +227,6 @@ systemctl daemon-reload
 %_unitdir_user/%name-popup.service
 %_unitdir_user/%name-popup.socket
 %_unitdir_user/sockets.target.wants/%name-popup.socket
-%_unitdir/%name-popup@.service
-%_unitdir/%name-popup@.socket
-%_unitdir/user-sockets@.target.wants/%name-popup@.socket
 %_bindir/tpkp-popup
 
 %files devel

diff --git a/systemd/CMakeLists.txt b/systemd/CMakeLists.txt
index d7b3650202a68b1d09fc74816734a9897623fa1b..47d702ad6138e7b2b4f175ee4bec6f9cf1fc0034 100644 (file)
--- a/systemd/CMakeLists.txt
+++ b/systemd/CMakeLists.txt
@@ -1,8 +1,6 @@
 IF (CXXABI STREQUAL "cxx03")
 CONFIGURE_FILE(pubkey-pinning-popup-deprecated.service.in pubkey-pinning-popup-deprecated.service @ONLY)
 CONFIGURE_FILE(pubkey-pinning-popup-deprecated.socket.in pubkey-pinning-popup-deprecated.socket @ONLY)
-CONFIGURE_FILE(pubkey-pinning-popup-deprecated@.service.in pubkey-pinning-popup-deprecated@.service @ONLY)
-CONFIGURE_FILE(pubkey-pinning-popup-deprecated@.socket.in pubkey-pinning-popup-deprecated@.socket @ONLY)
 
 INSTALL(
        FILES
@@ -11,19 +9,9 @@ INSTALL(
        DESTINATION
                ${SYSTEMD_UNIT_DIR}
        )
-
-INSTALL(
-       FILES
-               pubkey-pinning-popup-deprecated@.service
-               pubkey-pinning-popup-deprecated@.socket
-       DESTINATION
-               ${SYSTEMD_UNIT_SYSTEM_DIR}
-       )
 ELSE (CXXABI NOT STREQUAL "cxx03")
 CONFIGURE_FILE(pubkey-pinning-popup.service.in pubkey-pinning-popup.service @ONLY)
 CONFIGURE_FILE(pubkey-pinning-popup.socket.in pubkey-pinning-popup.socket @ONLY)
-CONFIGURE_FILE(pubkey-pinning-popup@.service.in pubkey-pinning-popup@.service @ONLY)
-CONFIGURE_FILE(pubkey-pinning-popup@.socket.in pubkey-pinning-popup@.socket @ONLY)
 
 INSTALL(
        FILES
@@ -32,12 +20,4 @@ INSTALL(
        DESTINATION
                ${SYSTEMD_UNIT_DIR}
        )
-
-INSTALL(
-       FILES
-               pubkey-pinning-popup@.service
-               pubkey-pinning-popup@.socket
-       DESTINATION
-               ${SYSTEMD_UNIT_SYSTEM_DIR}
-       )
 ENDIF (CXXABI STREQUAL "cxx03")

diff --git a/systemd/pubkey-pinning-popup-deprecated@.service.in b/systemd/pubkey-pinning-popup-deprecated@.service.in
deleted file mode 100644 (file)
index f1a07bf..0000000
--- a/systemd/pubkey-pinning-popup-deprecated@.service.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-Description=TPKP(Tizen Public Key Pinning) popup 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
-ExecStart=/usr/bin/tpkp-popup-deprecated
-Type=simple
-EnvironmentFile=/run/tizen-system-env
-Sockets=pubkey-pinning-popup-deprecated@%i.socket

diff --git a/systemd/pubkey-pinning-popup-deprecated@.socket.in b/systemd/pubkey-pinning-popup-deprecated@.socket.in
deleted file mode 100644 (file)
index e207fbd..0000000
--- a/systemd/pubkey-pinning-popup-deprecated@.socket.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-DefaultDependencies=no
-After=systemd-logind.service
-
-[Socket]
-SocketUser=%i
-ListenStream=@SOCK_PATH@
-SocketMode=0777
-Service=pubkey-pinning-popup-deprecated@%i.service
-
-[Install]
-WantedBy=user-sockets@.target

diff --git a/systemd/pubkey-pinning-popup@.service.in b/systemd/pubkey-pinning-popup@.service.in
deleted file mode 100644 (file)
index 034ec26..0000000
--- a/systemd/pubkey-pinning-popup@.service.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-Description=TPKP(Tizen Public Key Pinning) popup 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
-ExecStart=/usr/bin/tpkp-popup
-Type=simple
-EnvironmentFile=/run/tizen-system-env
-Sockets=pubkey-pinning-popup@%i.socket

diff --git a/systemd/pubkey-pinning-popup@.socket.in b/systemd/pubkey-pinning-popup@.socket.in
deleted file mode 100644 (file)
index e24d7b9..0000000
--- a/systemd/pubkey-pinning-popup@.socket.in
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-PartOf=userlogin@%i.target
-DefaultDependencies=no
-After=systemd-logind.service
-
-[Socket]
-SocketUser=%i
-ListenStream=@SOCK_PATH@
-SocketMode=0777
-Service=pubkey-pinning-popup@%i.service
-
-[Install]
-WantedBy=user-sockets@.target