summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSung-jae Park <nicesj.park@samsung.com>2013-05-16 04:27:53 (GMT)
committerSung-jae Park <nicesj.park@samsung.com>2013-05-16 05:54:28 (GMT)
commit65effc7720084686670a26d974b464f984812308 (patch)
treeb450112a4a67c516237df0a19ce2f35caf184fcc
parent091d1a58b29d011c70afd67065f93877910593f8 (diff)
downloaddata-provider-master-65effc7720084686670a26d974b464f984812308.zip
data-provider-master-65effc7720084686670a26d974b464f984812308.tar.gz
data-provider-master-65effc7720084686670a26d974b464f984812308.tar.bz2
Use the default environment file for systemdsubmit/tizen_2.1/20130516.133703accepted/tizen_2.1/20130520.093246
Change-Id: Id04977488c4a2599f95e16107e0d808f57901973
-rw-r--r--data-provider-master.manifest5
-rw-r--r--data/CMakeLists.txt2
-rw-r--r--data/data-provider-master.service7
-rw-r--r--packaging/data-provider-master.spec9
4 files changed, 10 insertions, 13 deletions
diff --git a/data-provider-master.manifest b/data-provider-master.manifest
index 89ceb02..1baa03a 100644
--- a/data-provider-master.manifest
+++ b/data-provider-master.manifest
@@ -51,9 +51,8 @@
<!-- Init script -->
<filesystem path="/etc/rc.d/init.d/data-provider-master" label="_" exec_label="none" />
<filesystem path="/etc/rc.d/rc3.d/S99data-provider-master" label="_" exec_label="none" />
-
- <filesystem path="/usr/lib/systemd/system/data-provider-master.service" label="_" />
- <filesystem path="/usr/lib/systemd/system/multi-user.target.wants/data-provider-master.service" label="_" />
+ <filesystem path="/usr/lib/systemd/user/data-provider-master.service" label="_" />
+ <filesystem path="/usr/lib/systemd/user/tizen-middleware.target.wants/data-provider-master.service" label="_" />
<!-- Package manager plugin -->
<filesystem path="/usr/etc/package-manager/parserlib/liblivebox.so" label="_" />
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index ade7015..772eac6 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,2 +1,2 @@
INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/data-provider-master DESTINATION /etc/rc.d/init.d/ PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/data-provider-master.service DESTINATION /usr/lib/systemd/system/ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
+INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/data-provider-master.service DESTINATION /usr/lib/systemd/user/ PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
diff --git a/data/data-provider-master.service b/data/data-provider-master.service
index b9c9e51..bf8a534 100644
--- a/data/data-provider-master.service
+++ b/data/data-provider-master.service
@@ -16,8 +16,7 @@
[Unit]
Description=Data Provider daemon
-After=rc-sdlevelinit.service
-Requires=rc-sdlevelinit.service
+After=xorg.target
[Service]
Environment=BUFMGR_LOCK_TYPE="once"
@@ -25,7 +24,7 @@ Environment=BUFMGR_MAP_CACHE="true"
Type=simple
ExecStart=/usr/bin/data-provider-master
RestartSec=1
-Restart=restart-always
+Restart=always
[Install]
-WantedBy=multi-user.target
+WantedBy=tizen-middleware.target
diff --git a/packaging/data-provider-master.spec b/packaging/data-provider-master.spec
index 15241ce..c1d54a9 100644
--- a/packaging/data-provider-master.spec
+++ b/packaging/data-provider-master.spec
@@ -57,12 +57,11 @@ mkdir -p %{buildroot}/opt/usr/share/live_magazine/reader
mkdir -p %{buildroot}/opt/usr/share/live_magazine/always
mkdir -p %{buildroot}/opt/dbspace
mkdir -p %{buildroot}/%{_sysconfdir}/rc.d/rc3.d
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
+mkdir -p %{buildroot}/%{_libdir}/systemd/user/tizen-middleware.target.wants
touch %{buildroot}/opt/dbspace/.livebox.db
touch %{buildroot}/opt/dbspace/.livebox.db-journal
ln -sf %{_sysconfdir}/rc.d/init.d/data-provider-master %{buildroot}/%{_sysconfdir}/rc.d/rc3.d/S99data-provider-master
-ln -sf ../data-provider-master.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/data-provider-master.service
-
+ln -sf %{_libdir}/systemd/user/data-provider-master.service %{buildroot}/%{_libdir}/systemd/user/tizen-middleware.target.wants/data-provider-master.service
%pre
# Executing the stop script for stopping the service of installed provider (old version)
@@ -96,8 +95,8 @@ echo "%{_sysconfdir}/init.d/data-provider-master start"
%{_bindir}/liveinfo
%{_prefix}/etc/package-manager/parserlib/*
%{_datarootdir}/data-provider-master/*
-%{_libdir}/systemd/system/multi-user.target.wants/data-provider-master.service
-%{_libdir}/systemd/system/data-provider-master.service
+%{_libdir}/systemd/user/data-provider-master.service
+%{_libdir}/systemd/user/tizen-middleware.target.wants/data-provider-master.service
%{_datarootdir}/license/*
/opt/usr/share/live_magazine
/opt/usr/share/live_magazine/log