update osp initialization

Change-Id: Ic6f32c10e6a2d1f800b1c27b3210a71b1f60d238
Signed-off-by: Young Ik Cho <youngik.cho@samsung.com>

diff --git a/global_res/etc/rc.d/init.d/boot-osp.sh b/global_res/etc/rc.d/init.d/boot-osp.sh
deleted file mode 100755 (executable)
index ea09964..0000000
--- a/global_res/etc/rc.d/init.d/boot-osp.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-OSP_DAEMON_NAME=osp-app-service
-OSP_DAEMON_APPID=aospd00043
-OSP_DAEMON_PATH=/opt/apps/aospd00043/bin/osp-app-service
-
-if [ ! -e /opt/etc/.ospfirstboot ]
-then
-       if [ ! -e /opt/usr/dbspace/.app-package.db ]
-       then
-               /usr/etc/package-manager/backend/tpk -r /opt/apps
-       fi
-       /bin/touch /opt/etc/.ospfirstboot
-fi
-
-case "$1" in
-       start)
-               echo "Starting OSP app-service"
-               $OSP_DAEMON_PATH &
-               PID=`pidof $OSP_DAEMON_NAME`
-               if [ -n "$PID" ]; then
-                       aul_test update_list $OSP_DAEMON_APPID.$OSP_DAEMON_NAME $OSP_DAEMON_PATH $PID
-               fi
-               ;;
-       stop)
-               echo "Stopping OSP app-service"
-               PID=`pidof $OSP_DAEMON_NAME`
-               if [ -n "$PID" ]; then
-                       kill $PID
-               fi
-               ;;
-       *)
-               echo "Usage: boot-osp.sh {start|stop}" >&2
-               exit 3
-               ;;
-esac
-

diff --git a/global_res/usr/lib/systemd/system/boot-osp.path b/global_res/usr/lib/systemd/system/boot-osp.path
new file mode 100644 (file)
index 0000000..cbd4414
--- /dev/null
+++ b/global_res/usr/lib/systemd/system/boot-osp.path
@@ -0,0 +1,7 @@
+[Unit]
+Description=Path activation for the "OSP app service"
+
+[Path]
+PathExists=/tmp/amd_ready
+PathExists=/tmp/.wm_ready
+

diff --git a/global_res/usr/lib/systemd/user/osp-app-service.service b/global_res/usr/lib/systemd/system/boot-osp.service
similarity index 77%
rename from global_res/usr/lib/systemd/user/osp-app-service.service
rename to global_res/usr/lib/systemd/system/boot-osp.service
index ee1dffa..b4f1b3e 100644 (file)
--- a/global_res/usr/lib/systemd/user/osp-app-service.service
+++ b/global_res/usr/lib/systemd/system/boot-osp.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=OSP app service
-After=xorg.target starter.service
-Requires=xorg.target
+After=ac.service
+Requires=ac.service
 
 [Service]
 Type=simple
@@ -11,4 +11,4 @@ Restart=always
 Environment=DISPLAY=:0
 
 [Install]
-WantedBy=core-efl.target
+WantedBy=multi-user.target

diff --git a/global_res/usr/lib/systemd/system/multi-user.target.wants/boot-osp.path b/global_res/usr/lib/systemd/system/multi-user.target.wants/boot-osp.path
new file mode 120000 (symlink)
index 0000000..bff1248
--- /dev/null
+++ b/global_res/usr/lib/systemd/system/multi-user.target.wants/boot-osp.path
@@ -0,0 +1 @@
+../boot-osp.path
\ No newline at end of file

diff --git a/global_res/usr/lib/systemd/user/core-efl.target.wants/osp-app-service.service b/global_res/usr/lib/systemd/user/core-efl.target.wants/osp-app-service.service
deleted file mode 120000 (symlink)
index be5505d..0000000
--- a/global_res/usr/lib/systemd/user/core-efl.target.wants/osp-app-service.service
+++ /dev/null
@@ -1 +0,0 @@
-../osp-app-service.service
\ No newline at end of file

diff --git a/global_res/usr/lib/systemd/user/status-manager.service b/global_res/usr/lib/systemd/user/status-manager.service
new file mode 100644 (file)
index 0000000..fd3dadb
--- /dev/null
+++ b/global_res/usr/lib/systemd/user/status-manager.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=platform service status manager
+After=tizen-middleware.target
+
+[Service]
+Type=oneshot
+ExecStart=/usr/bin/vconftool -f set -t int memory/deviced/boot_power_on 1 -i
+
+[Install]
+WantedBy=tizen-mobile-session.target

diff --git a/global_res/usr/lib/systemd/user/tizen-mobile-session.target.wants/status-manager.service b/global_res/usr/lib/systemd/user/tizen-mobile-session.target.wants/status-manager.service
new file mode 120000 (symlink)
index 0000000..f034619
--- /dev/null
+++ b/global_res/usr/lib/systemd/user/tizen-mobile-session.target.wants/status-manager.service
@@ -0,0 +1 @@
+../status-manager.service
\ No newline at end of file

diff --git a/manifest.xml b/manifest.xml
old mode 100755 (executable)
new mode 100644 (file)
index 7d0fa32..315b067
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,27 +1,22 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<Manifest xmlns="http://schemas.tizen.org/2012/06/manifest">
+<Manifest xmlns="http://schemas.tizen.org/2012/12/manifest">
     <Id>aospd00043</Id>
     <Version>1.0.0</Version>
-    <Type>C++App</Type>
-    <Vendors>
-        <Vendor Locale="eng-GB">Samsung Electronics</Vendor>
-    </Vendors>
+       <Type>C++App</Type>
     <Descriptions/>
-    <Url/>
     <Requirements/>
     <Apps>
-        <ApiVersion>2.1</ApiVersion>
-        <Secret>9C645DDBA19C71BAD1204DA4DAA7A0B9</Secret>
+        <ApiVersion>2.2</ApiVersion>
         <Privileges>
-            <Privilege>http://tizen.org/privilege/application.launch</Privilege>
-            <Privilege>http://tizen.org/privilege/appmanager.launch</Privilege>
-            <Privilege>http://tizen.org/privilege/alarm</Privilege>
-           <Privilege>http://tizen.org/privilege/privilegemanager.read</Privilege>
-            <Privilege>http://tizen.org/privilege/packageinfo</Privilege>
+                       <Privilege>http://tizen.org/privilege/application.launch</Privilege>
+                       <Privilege>http://tizen.org/privilege/appmanager.launch</Privilege>
+                       <Privilege>http://tizen.org/privilege/alarm</Privilege>
+                       <Privilege>http://tizen.org/privilege/privilegemanager.read</Privilege>
+                       <Privilege>http://tizen.org/privilege/packageinfo</Privilege>
         </Privileges>
         <ServiceApp SystemService="True" AutoRestart="False" Default="True" ExecutableName="osp-app-service" LaunchOnBoot="False">
             <Names>
-                <Name Locale="eng-GB">osp-app-service</Name>
+                <Name Locale="eng-GB">Native Application Service</Name>
             </Names>
             <Icons/>
             <AppControls/>

diff --git a/osp-app-service.manifest b/osp-app-service.manifest
index 2eeed0b..289f7d2 100644 (file)
--- a/osp-app-service.manifest
+++ b/osp-app-service.manifest
@@ -13,10 +13,13 @@
                <filesystem path="/etc/rc.d/init.d/boot-osp.sh" label="_" exec_label="none"/>
                <filesystem path="/usr/share/license/osp-app-service" label="_"/>
                <filesystem path="/opt/usr/etc/system_info_cache.ini" label="_"/>
-               <filesystem path="/usr/lib/systemd/user/osp-app-service.service" label="_" exec_label="none" />
-               <filesystem path="/usr/lib/systemd/user/core-efl.target.wants/osp-app-service.service" label="_" exec_label="none" />
-               <filesystem path="/etc/tmpfiles.d/osp-app-service.conf" label="_" exec_label="none" />
-               <filesystem path="/usr/lib/systemd/system/osp-tmpdir-setup.service" label="_" exec_label="none" />
-               <filesystem path="/usr/lib/systemd/system/multi-user.target.wants/osp-tmpdir-setup.service" label="_" exec_label="none" />
+               <filesystem path="/etc/tmpfiles.d/osp-app-service.conf" label="_" exec_label="none"/>
+               <filesystem path="/usr/lib/systemd/system/boot-osp.service" label="_" exec_label="none"/>
+               <filesystem path="/usr/lib/systemd/system/boot-osp.path" label="_" exec_label="none"/>
+               <filesystem path="/usr/lib/systemd/system/osp-tmpdir-setup.service" label="_" exec_label="none"/>
+               <filesystem path="/usr/lib/systemd/system/multi-user.target.wants/boot-osp.path" label="_" exec_label="none"/>
+               <filesystem path="/usr/lib/systemd/system/multi-user.target.wants/osp-tmpdir-setup.service" label="_" exec_label="none"/>
+               <filesystem path="/usr/lib/systemd/user/status-manager.service" label="_" exec_label="none"/>
+               <filesystem path="/usr/lib/systemd/user/tizen-mobile-session.target.wants/status-manager.service" label="_" exec_label="none"/>
        </assign>
 </manifest>

diff --git a/packaging/osp-app-service.spec b/packaging/osp-app-service.spec
index 653216b..e48f96d 100644 (file)
--- a/packaging/osp-app-service.spec
+++ b/packaging/osp-app-service.spec
@@ -1,7 +1,7 @@
 Name:          osp-app-service
 Summary:       osp application service
 Version:       1.2.2.1
-Release:       3
+Release:       4
 Group:         System/Libraries
 License:       Apache-2.0 or Flora
 Source0:       %{name}-%{version}.tar.gz
@@ -114,8 +114,6 @@ cat %{_builddir}/%{name}-%{version}/LICENSE.APLv2 >> %{buildroot}/usr/share/lice
 mkdir -p /usr/apps/aospd00043/lib
 
 /usr/etc/package-manager/backend/tpk -i /usr/apps/aospd00043
-chown root /usr/apps/aospd00043/bin/osp-app-service
-chmod u+s /usr/apps/aospd00043/bin/osp-app-service
 
 vconftool -f set -t int memory/appservice/status -1 -i -u 5000
 
@@ -133,11 +131,7 @@ fi
 %manifest osp-app-service.manifest
 /usr/share/license/%{name}
 /usr/apps/*
-%config /etc/rc.d/*
 %config /etc/tmpfiles.d/osp-app-service.conf
 %config(noreplace) /opt/usr/etc/system_info_cache.ini
-%{_libdir}/systemd/user/osp-app-service.service
-%{_libdir}/systemd/user/core-efl.target.wants/osp-app-service.service
-%{_libdir}/systemd/system/osp-tmpdir-setup.service
-%{_libdir}/systemd/system/multi-user.target.wants/osp-tmpdir-setup.service
+%{_libdir}/systemd/*