[Tizen][PushD] Update to support Multi-user architecture - updated daemon & lib

Change-Id: Ibf8f2ab4902bf2e1c0d8c3a15ec0718c451aca30
Signed-off-by: HaJun, Sung <hajun.sung@samsung.com>

diff --git a/aarch64/bin/push_tool b/aarch64/bin/push_tool
index 8e19627..b928453 100755 (executable)
Binary files a/aarch64/bin/push_tool and b/aarch64/bin/push_tool differ

diff --git a/aarch64/bin/pushd b/aarch64/bin/pushd
index 43f2631..0d276ed 100755 (executable)
Binary files a/aarch64/bin/pushd and b/aarch64/bin/pushd differ

diff --git a/aarch64/lib64/libpush.so.0.2.12 b/aarch64/lib64/libpush.so.0.2.12
index 66af5de..3af97e1 100644 (file)
Binary files a/aarch64/lib64/libpush.so.0.2.12 and b/aarch64/lib64/libpush.so.0.2.12 differ

diff --git a/arm/bin/push_tool b/arm/bin/push_tool
index 574c23d..8f13812 100755 (executable)
Binary files a/arm/bin/push_tool and b/arm/bin/push_tool differ

diff --git a/arm/bin/pushd b/arm/bin/pushd
index a96c2a7..e06f900 100755 (executable)
Binary files a/arm/bin/pushd and b/arm/bin/pushd differ

diff --git a/arm/lib/libpush.so.0.2.12 b/arm/lib/libpush.so.0.2.12
index d6b452a..b1e4602 100644 (file)
Binary files a/arm/lib/libpush.so.0.2.12 and b/arm/lib/libpush.so.0.2.12 differ

diff --git a/packaging/push.spec b/packaging/push.spec
index b00d139..4a9574a 100644 (file)
--- a/packaging/push.spec
+++ b/packaging/push.spec
@@ -62,13 +62,9 @@ Push service tool
 
 %install
 rm -rf %{buildroot}
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-install -m 0644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/system/pushd.service
-ln -s ../pushd.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/pushd.service
-
-mkdir -p %{buildroot}%{_libdir}/systemd/user/tizen-middleware.target.wants
-cp %{SOURCE1} %{buildroot}%{_libdir}/systemd/user/pushd.service
-ln -s ../pushd.service %{buildroot}%{_libdir}/systemd/user/tizen-middleware.target.wants/
+mkdir -p %{buildroot}%{_unitdir_user}/default.target.wants
+install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir_user}/pushd.service
+ln -s ../pushd.service %{buildroot}%{_unitdir_user}/default.target.wants/pushd.service
 
 mkdir -p %{buildroot}/usr/share/license
 cp -f LICENSE %{buildroot}/usr/share/license/%{name}
@@ -135,12 +131,12 @@ cp -a x86/share/push/*.cer %{buildroot}/usr/share/push/
 
 
 %post bin
-mkdir -p /opt/usr/dbspace
-sqlite3 /opt/usr/dbspace/.push.db "PRAGMA journal_mode = PERSIST; create table a(a); drop table a;" > /dev/null
-chown system:5000 /opt/usr/dbspace/.push.db
-chown system:5000 /opt/usr/dbspace/.push.db-journal
-chmod 660 /opt/usr/dbspace/.push.db
-chmod 660 /opt/usr/dbspace/.push.db-journal
+#mkdir -p /usr/dbspace
+#sqlite3 /usr/dbspace/.push.db "PRAGMA journal_mode = PERSIST; create table a(a); drop table a;" > /dev/null
+#chown system:system /usr/dbspace/.push.db
+#chown system:system /usr/dbspace/.push.db-journal
+#chmod 660 /usr/dbspace/.push.db
+#chmod 660 /usr/dbspace/.push.db-journal
 
 %post -n libpush
 /sbin/ldconfig
@@ -158,7 +154,7 @@ chmod 660 /opt/usr/dbspace/.push.db-journal
 
 %files bin
 %manifest push-bin.manifest
-%attr(755,system,system)%{_bindir}/pushd
+%{_bindir}/pushd
 %attr(644,system,system)/usr/share/push/*.cer
 %attr(644,system,system)/usr/share/license/%{name}
 
@@ -168,10 +164,8 @@ chmod 660 /opt/usr/dbspace/.push.db-journal
 %attr(644,system,system)/usr/share/push/prd-dl-key.pem
 %endif
 
-%attr(755,system,system)%{_libdir}/systemd/user/pushd.service
-%attr(755,system,system)%{_libdir}/systemd/user/tizen-middleware.target.wants/pushd.service
-%attr(755,system,system)%{_libdir}/systemd/system/multi-user.target.wants/pushd.service
-%attr(755,system,system)%{_libdir}/systemd/system/pushd.service
+%{_unitdir_user}/pushd.service
+%{_unitdir_user}/default.target.wants/pushd.service
 
 %files tool
 %manifest push-tool.manifest

diff --git a/packaging/pushd.service b/packaging/pushd.service
index eda9e75..b6cad54 100644 (file)
--- a/packaging/pushd.service
+++ b/packaging/pushd.service
@@ -1,14 +1,12 @@
 [Unit]
 Description=Push daemon
-After=tizen-runtime.target
 
 [Service]
-Type=forking
+Type=simple
 ExecStart=/usr/bin/pushd
 Restart=always
+RestartSec=1
 MemoryLimit=10M
-User=system
-Group=system
 
 [Install]
-WantedBy=multi-user.target
+WantedBy=default.target

diff --git a/x86/bin/push_tool b/x86/bin/push_tool
index 35b174b..5dba5ea 100755 (executable)
Binary files a/x86/bin/push_tool and b/x86/bin/push_tool differ

diff --git a/x86/bin/pushd b/x86/bin/pushd
index 5909f68..edc455b 100755 (executable)
Binary files a/x86/bin/pushd and b/x86/bin/pushd differ

diff --git a/x86/lib/libpush.so.0.2.12 b/x86/lib/libpush.so.0.2.12
index c3bf3dc..889d98c 100644 (file)
Binary files a/x86/lib/libpush.so.0.2.12 and b/x86/lib/libpush.so.0.2.12 differ