Change directory path for unpacking package

$TZ_SYS_SHARE(/opt/share/) may not have enough space.
Use /opt/usr/share/package-unpacked instead.

Change-Id: If08299d5263b35a415a92ade0824e9ca5a85094b
Signed-off-by: Sangyoon Jang <jeremy.jang@samsung.com>

diff --git a/packaging/app-installers.spec b/packaging/app-installers.spec
index cb2f2cd..c32c168 100644 (file)
--- a/packaging/app-installers.spec
+++ b/packaging/app-installers.spec
@@ -1,3 +1,5 @@
+%define unpackdir /opt/usr/share/package-unpacked
+
 Name:           app-installers
 Summary:        Application installers
 Version:        1.22.7
@@ -75,19 +77,20 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
          -DTIZEN_FULL_VERSION=%{tizen_full_version} \
          -DUNITDIR=%{_unitdir} \
          -DUNITDIR_USER=%{_unitdir_user} \
-         -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+         -DFULLVER=%{version} -DMAJORVER=${MAJORVER} \
+         -DUNPACKDIR=%{unpackdir}
 
 make %{?_smp_mflags}
 
 %install
 %make_install
 
-mkdir -p %{buildroot}%{TZ_SYS_SHARE}/package-unpacked/
+mkdir -p %{buildroot}%{unpackdir}
 mkdir -p %{buildroot}%{_unitdir_user}/default.target.wants
 ln -sf ../package-recovery-helper.service %{buildroot}%{_unitdir_user}/default.target.wants/package-recovery-helper.service
 
 %post
-chsmack -a System %{TZ_SYS_SHARE}/package-unpacked/
+chsmack -a System %{unpackdir}
 
 %postun
 
@@ -110,7 +113,7 @@ chsmack -a System %{TZ_SYS_SHARE}/package-unpacked/
 %{_unitdir}/package-recovery.service
 %{_unitdir_user}/package-recovery-helper.service
 %{_unitdir_user}/default.target.wants/package-recovery-helper.service
-%{TZ_SYS_SHARE}/package-unpacked/
+%{unpackdir}
 %license LICENSE
 
 %files devel

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index a7ca189..f71d5dc 100644 (file)
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -76,6 +76,7 @@ IF(NOT DEFINED TIZEN_FULL_VERSION)
 ELSE(NOT DEFINED TIZEN_FULL_VERSION)
   ADD_DEFINITIONS("-DTIZEN_FULL_VERSION=\"${TIZEN_FULL_VERSION}\"")
 ENDIF(NOT DEFINED TIZEN_FULL_VERSION)
+ADD_DEFINITIONS("-DUNPACKDIR=\"${UNPACKDIR}\"")
 CONFIGURE_FILE(${PLUGINS_LIST_FILE_PATH}.in ${PLUGINS_LIST_FILE_PATH} @ONLY)
 INSTALL(FILES ${PLUGINS_LIST_FILE_PATH} DESTINATION ${PLUGINS_LIST_INSTALL_PATH}/)
 

diff --git a/src/common/step/filesystem/step_unzip.cc b/src/common/step/filesystem/step_unzip.cc
index 3d9c392..e6be344 100644 (file)
--- a/src/common/step/filesystem/step_unzip.cc
+++ b/src/common/step/filesystem/step_unzip.cc
@@ -24,8 +24,7 @@ namespace bs = boost::system;
 
 namespace {
 
-const char* kPackageUnpackDirPath =
-    tzplatform_mkpath(TZ_SYS_SHARE, "package-unpacked");
+const char kPackageUnpackDirPath[] = UNPACKDIR;
 
 bool CheckFreeSpaceAtPath(int64_t required_size,
     const boost::filesystem::path& target_location) {