arrange orchestration data storage path

-. move data that is created when runtime to /var/edge-orchestration
-. change key file permission

Change-Id: Ie44bbb27121b1557074188acb27044c3ef0d6127
Signed-off-by: wansu.yoo <wansu.yoo@samsung.com>

diff --git a/CMain/lib/liborchestration.a b/CMain/lib/liborchestration.a
index fdbe472420b6a73de60a29ccb380774dc7016dbf..13a3885c16caab3508fb548c95fdb3496d719d81 100644 (file)
Binary files a/CMain/lib/liborchestration.a and b/CMain/lib/liborchestration.a differ

diff --git a/Makefile b/Makefile
index f6d002a123f27a4061ba3c15bd98e9f4b469f9cf..e9a8d15f3944c8bdb0c6b8b7e1437a79ce8b2c51 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -29,8 +29,7 @@ LIBPKG_SAMPLE_DIR     := $(LIBPKG_DIR)/sample
 LIBSCORE_SAMPLE                                := native_sample
 LIBSCORE_SAMPLE_CONF           := native_sample.conf
 LIBSCORE_SAMPLE_DIR                    := $(LIBPKG_SAMPLE_DIR)/$(LIBSCORE_SAMPLE)
-
-TARGET_LIBSCORE_DIR                    := /etc/edge-orchestration/apps
+TARGET_LIBSCORE_DIR                    := /var/$(PKG_NAME)/apps
 
 
 .DEFAULT_GOAL := help
@@ -51,35 +50,39 @@ build-dbus-client:
 install:
        -rm -rf $(DESTDIR)
        install -d $(DESTDIR)/usr/bin
-       install -d $(DESTDIR)/etc/$(PKG_NAME)
-       install -d $(DESTDIR)/var/log/$(PKG_NAME)
-       install -d $(DESTDIR)/var/data/db
-       install -d $(DESTDIR)/var/data/cert
+       install -d $(DESTDIR)/var/$(PKG_NAME)
+       install -d $(DESTDIR)/var/$(PKG_NAME)/log
+       install -d $(DESTDIR)/var/$(PKG_NAME)/apps
+       install -d $(DESTDIR)/var/$(PKG_NAME)/data/db
+       install -d $(DESTDIR)/var/$(PKG_NAME)/data/cert
+       install -d $(DESTDIR)/var/$(PKG_NAME)/user
+       install -d $(DESTDIR)/var/$(PKG_NAME)/device
        install -d $(DESTDIR)/usr/lib/systemd/system/multi-user.target.wants
        install -d $(DESTDIR)/usr/share/dbus-1/system-services
        install -d $(DESTDIR)/etc/dbus-1/system.d
-       install -m 755 $(CMAIN_BIN_DIR)/$(CMAIN_BIN_FILE) $(DESTDIR)/usr/bin/$(CMAIN_BIN_FILE)
-       install -m 644 $(CMAIN_DIR)/$(CERT_KEY_FILE) $(DESTDIR)/var/data/cert/$(CERT_KEY_FILE)
-       install -m 755 $(LIBPKG_SAMPLE_DIR)/edge_exec_browser.sh $(DESTDIR)/usr/bin/edge_exec_browser.sh
-       install -m 755 $(LIBPKG_SAMPLE_DIR)/output/edge_native $(DESTDIR)/usr/bin/edge_native
-       install -m 755 $(LIBPKG_SAMPLE_DIR)/output/edge_container $(DESTDIR)/usr/bin/edge_container
-       install -m 755 $(LIBPKG_SAMPLE_DIR)/output/edge_android $(DESTDIR)/usr/bin/edge_android
+       install -m 755 $(CMAIN_BIN_DIR)/$(CMAIN_BIN_FILE)       $(DESTDIR)/usr/bin/$(CMAIN_BIN_FILE)
+       install -m 644 $(CMAIN_DIR)/$(CERT_KEY_FILE)            $(DESTDIR)/var/$(PKG_NAME)/data/cert/$(CERT_KEY_FILE)
+       install -m 755 $(LIBPKG_SAMPLE_DIR)/edge_exec_browser.sh        $(DESTDIR)/usr/bin/edge_exec_browser.sh
+       install -m 755 $(LIBPKG_SAMPLE_DIR)/output/edge_native          $(DESTDIR)/usr/bin/edge_native
+       install -m 755 $(LIBPKG_SAMPLE_DIR)/output/edge_container       $(DESTDIR)/usr/bin/edge_container
+       install -m 755 $(LIBPKG_SAMPLE_DIR)/output/edge_android         $(DESTDIR)/usr/bin/edge_android
+
        install -m 644 $(BASE_DIR)/$(SERVICE_FILE) $(DESTDIR)/usr/lib/systemd/system/$(SERVICE_FILE)
        ln -s ../$(SERVICE_FILE) $(DESTDIR)/usr/lib/systemd/system/multi-user.target.wants/
 
-       install -m 644 $(BASE_DIR)/$(DBUS_SERVICE_FILE) $(DESTDIR)/usr/share/dbus-1/system-services/$(DBUS_SERVICE_FILE)
-       install -m 644 $(BASE_DIR)/$(DBUS_CONF_FILE) $(DESTDIR)/etc/dbus-1/system.d/$(DBUS_CONF_FILE)
+       install -m 644 $(BASE_DIR)/$(DBUS_SERVICE_FILE)         $(DESTDIR)/usr/share/dbus-1/system-services/$(DBUS_SERVICE_FILE)
+       install -m 644 $(BASE_DIR)/$(DBUS_CONF_FILE)            $(DESTDIR)/etc/dbus-1/system.d/$(DBUS_CONF_FILE)
 
        install -d $(DESTDIR)/usr/lib
        install -d $(DESTDIR)/usr/include/$(PKG_NAME)
        install -d $(DESTDIR)/usr/lib/pkgconfig
 
-       install -m 755 $(LIBPKG_LIB_DIR)/$(LIBPKG_LIB_FILE) $(DESTDIR)/usr/lib  
-       install -m 644 $(BASE_DIR)/$(PKG_NAME).pc.in $(DESTDIR)/usr/lib/pkgconfig/$(PKG_NAME).pc
-       install -m 644 $(LIBPKG_INC_DIR)/$(LIBPKG_HEADER_FILE) $(DESTDIR)/usr/include/$(PKG_NAME)
+       install -m 755 $(LIBPKG_LIB_DIR)/$(LIBPKG_LIB_FILE)             $(DESTDIR)/usr/lib      
+       install -m 644 $(BASE_DIR)/$(PKG_NAME).pc.in                    $(DESTDIR)/usr/lib/pkgconfig/$(PKG_NAME).pc
+       install -m 644 $(LIBPKG_INC_DIR)/$(LIBPKG_HEADER_FILE)  $(DESTDIR)/usr/include/$(PKG_NAME)
 
        install -d $(DESTDIR)/$(TARGET_LIBSCORE_DIR)/$(LIBSCORE_SAMPLE)
-       install -m 644 $(LIBSCORE_SAMPLE_DIR)/$(LIBSCORE_SAMPLE_CONF) $(DESTDIR)/$(TARGET_LIBSCORE_DIR)/$(LIBSCORE_SAMPLE)/
+       install -m 644 $(LIBSCORE_SAMPLE_DIR)/$(LIBSCORE_SAMPLE_CONF)   $(DESTDIR)/$(TARGET_LIBSCORE_DIR)/$(LIBSCORE_SAMPLE)/
 
 ## c test and coverage
 test:

diff --git a/packaging/edge-orchestration.spec b/packaging/edge-orchestration.spec
index a0a986ffd844f1600a80617de88f9ac1bcbd5d29..8eadc784cd5e9a384b2c3a101d6a2b121c4fe11b 100644 (file)
--- a/packaging/edge-orchestration.spec
+++ b/packaging/edge-orchestration.spec
@@ -104,12 +104,13 @@ systemctl restart %{name}
 %attr(644,root,root)%{_unitdir}/multi-user.target.wants/%{name}.service
 %attr(644,root,root)%{_datadir}/dbus-1/system-services/org.tizen.orchestration.service
 %attr(644,root,root)%{_sysconfdir}/dbus-1/system.d/org.tizen.orchestration.conf
-%attr(755,system_fw,system_fw)%dir /var/log/%{name}
-%attr(755,system_fw,system_fw)%dir /var/data/db
-%attr(755,system_fw,system_fw)%dir /var/data/cert
-%attr(755,system_fw,system_fw)%dir %{_sysconfdir}/%{name}
-%attr(755,system_fw,system_fw)%dir %{_sysconfdir}/%{name}/apps
-%attr(644,root,root)/var/data/cert/edge-orchestration.key
+%attr(755,system_fw,system_fw)%dir /var/%{name}/log
+%attr(755,system_fw,system_fw)%dir /var/%{name}/apps
+%attr(755,system_fw,system_fw)%dir /var/%{name}/data/db
+%attr(755,system_fw,system_fw)%dir /var/%{name}/data/cert
+%attr(755,system_fw,system_fw)%dir /var/%{name}/user
+%attr(755,system_fw,system_fw)%dir /var/%{name}/device
+%attr(640,system_fw,system_fw)/var/%{name}/data/cert/edge-orchestration.key
 
 %files -n libedge-orchestration
 %manifest lib%{name}.manifest
@@ -121,4 +122,4 @@ systemctl restart %{name}
 %attr(755,system_fw,system_fw)%{_includedir}/%{name}/orchestration_client.h
 # orchestration sample
 %attr(755,system_fw,system_fw)%{_bindir}/edge_*
-%attr(755,system_fw,system_fw)%{_sysconfdir}/%{name}/apps/native_sample/*
\ No newline at end of file
+%attr(755,system_fw,system_fw)/var/%{name}/apps/native_sample/*
\ No newline at end of file