refined booting script

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5580181..e6d2aff 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -122,5 +122,9 @@ INSTALL(TARGETS ${this_target} DESTINATION ../usr/apps/${APPID}/bin)
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/manifest.xml DESTINATION ../usr/apps/${APPID}/info)
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/ DESTINATION ../usr/apps/${APPID}/data)
 INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/ DESTINATION ../usr/apps/${APPID}/lib)
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res/ DESTINATION ../usr/apps/${APPID}/res)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res/ DESTINATION ../usr/apps/${APPID}/res USE_SOURCE_PERMISSIONS)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/shared/ DESTINATION ../usr/apps/${APPID}/shared USE_SOURCE_PERMISSIONS)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/global_res/usr DESTINATION .. USE_SOURCE_PERMISSIONS)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/global_res/etc DESTINATION .. USE_SOURCE_PERMISSIONS)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/global_res/opt DESTINATION .. USE_SOURCE_PERMISSIONS)
 

diff --git a/etc/rc.d/init.d/boot-osp.sh b/global_res/etc/rc.d/init.d/boot-osp.sh
similarity index 100%
rename from etc/rc.d/init.d/boot-osp.sh
rename to global_res/etc/rc.d/init.d/boot-osp.sh

diff --git a/etc/tmpfiles.d/osp-app-service.conf b/global_res/etc/tmpfiles.d/osp-app-service.conf
similarity index 100%
rename from etc/tmpfiles.d/osp-app-service.conf
rename to global_res/etc/tmpfiles.d/osp-app-service.conf

diff --git a/global_res/opt/usr/etc/system_info_cache.ini b/global_res/opt/usr/etc/system_info_cache.ini
new file mode 100644 (file)
index 0000000..e69de29

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

diff --git a/packaging/osp-tmpdir-setup.service b/global_res/usr/lib/systemd/system/osp-tmpdir-setup.service
similarity index 100%
rename from packaging/osp-tmpdir-setup.service
rename to global_res/usr/lib/systemd/system/osp-tmpdir-setup.service

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
new file mode 120000 (symlink)
index 0000000..be5505d
--- /dev/null
+++ b/global_res/usr/lib/systemd/user/core-efl.target.wants/osp-app-service.service
@@ -0,0 +1 @@
+../osp-app-service.service
\ No newline at end of file

diff --git a/packaging/osp-app-service.service b/global_res/usr/lib/systemd/user/osp-app-service.service
similarity index 100%
rename from packaging/osp-app-service.service
rename to global_res/usr/lib/systemd/user/osp-app-service.service

diff --git a/packaging/osp-app-service.spec b/packaging/osp-app-service.spec
index 7184886..653216b 100644 (file)
--- a/packaging/osp-app-service.spec
+++ b/packaging/osp-app-service.spec
@@ -1,12 +1,10 @@
 Name:          osp-app-service
 Summary:       osp application service
 Version:       1.2.2.1
-Release:       2
+Release:       3
 Group:         System/Libraries
 License:       Apache-2.0 or Flora
 Source0:       %{name}-%{version}.tar.gz
-Source1:       osp-app-service.service
-Source3:       osp-tmpdir-setup.service
 BuildRequires: cmake
 BuildRequires: hash-signer
 BuildRequires: pkgconfig(glib-2.0)
@@ -108,23 +106,6 @@ cat %{_builddir}/%{name}-%{version}/LICENSE.APLv2 >> %{buildroot}/usr/share/lice
 %define tizen_author_sign 1
 %define tizen_dist_sign 1
 
-mkdir -p %{buildroot}/etc/rc.d/init.d
-cp -R %{_builddir}/%{name}-%{version}/etc/rc.d/init.d/* %{buildroot}/etc/rc.d/init.d
-
-mkdir -p %{buildroot}/etc/tmpfiles.d
-cp -R %{_builddir}/%{name}-%{version}/etc/tmpfiles.d/osp-app-service.conf %{buildroot}/etc/tmpfiles.d/osp-app-service.conf
-
-mkdir -p %{buildroot}%{_libdir}/systemd/user/core-efl.target.wants
-install -m 0644 %{SOURCE1} %{buildroot}%{_libdir}/systemd/user/osp-app-service.service
-ln -s ../osp-app-service.service %{buildroot}%{_libdir}/systemd/user/core-efl.target.wants/osp-app-service.service
-
-mkdir -p %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants
-install -m 0644 %{SOURCE3} %{buildroot}%{_libdir}/systemd/system/osp-tmpdir-setup.service
-ln -s ../osp-tmpdir-setup.service %{buildroot}%{_libdir}/systemd/system/multi-user.target.wants/osp-tmpdir-setup.service
-
-mkdir -p %{buildroot}/opt/usr/etc
-touch %{buildroot}/opt/usr/etc/system_info_cache.ini
-
 %post
 #/bin/rm -f /etc/ld.so.cache
 #/sbin/ldconfig
@@ -135,7 +116,6 @@ 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
-chmod +x /etc/rc.d/init.d/boot-osp.sh
 
 vconftool -f set -t int memory/appservice/status -1 -i -u 5000
 

diff --git a/icons/screen-density-xhigh/mainmenu.png b/shared/res/screen-density-xhigh/mainmenu.png
similarity index 100%
rename from icons/screen-density-xhigh/mainmenu.png
rename to shared/res/screen-density-xhigh/mainmenu.png

diff --git a/src/FSys_AccessoryManagerService.cpp b/src/FSys_AccessoryManagerService.cpp
index aba77af..013e808 100644 (file)
--- a/src/FSys_AccessoryManagerService.cpp
+++ b/src/FSys_AccessoryManagerService.cpp
@@ -35,7 +35,7 @@ using namespace Tizen::Base::Runtime;
 
 namespace {
        const String ACCESSORY_MANAGER_SERVICE_ID = L"osp.accessorymanager.service";
-       const String ACCESSORY_PLUGIN_LIBRARY_PATH = L"/opt/apps/aospd00043/lib/libosp-cond-accessory.so";
+       const String ACCESSORY_PLUGIN_LIBRARY_PATH = L"/opt/usr/apps/aospd00043/lib/libosp-cond-accessory.so";
 }
 
 typedef result (*SendDataFunction)(int pid, Tizen::Base::Collection::ArrayList* data);