diff options
| author | Hyunbin Lee <hyunbin.lee@samsung.com> | 2013-03-18 13:15:04 +0900 |
|---|---|---|
| committer | Hyunbin Lee <hyunbin.lee@samsung.com> | 2013-03-18 13:23:57 +0900 |
| commit | 6e22a55815f35e98084ee0ba0cfafd274451004b (patch) | |
| tree | a0018bb32b8b5eae3d694e023d3fe7c8cb1be0cb | |
| parent | bacbfd8696a57aa07b3056698d150974f1694435 (diff) | |
| download | env-config-6e22a55815f35e98084ee0ba0cfafd274451004b.tar.gz env-config-6e22a55815f35e98084ee0ba0cfafd274451004b.tar.bz2 env-config-6e22a55815f35e98084ee0ba0cfafd274451004b.zip | |
Support external MMC path for OSP compatible apps.
Change-Id: I756afba91de1a49da66defb4920bdfd7515394a0
Signed-off-by: Hyunbin Lee <hyunbin.lee@samsung.com>
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | osp-env-config.c | 12 | ||||
| -rwxr-xr-x | packaging/osp-env-config.spec | 8 |
3 files changed, 9 insertions, 13 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 01972db..315d1cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -27,7 +27,7 @@ SET_TARGET_PROPERTIES(${this_target} CLEAN_DIRECT_OUTPUT 1 ) -INSTALL(TARGETS ${this_target} DESTINATION lib +INSTALL(TARGETS ${this_target} DESTINATION ${LIB_INSTALL_DIR} PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) diff --git a/osp-env-config.c b/osp-env-config.c index fbfa70e..ba389df 100644 --- a/osp-env-config.c +++ b/osp-env-config.c @@ -463,11 +463,11 @@ mount_osp_external_paths(const char* app_rootpath, const char* pkgid) char osp_ext_share2_pkgid_path[PATH_MAX] = {0, }; struct _path_info mount_info[] = { { "/opt/storage/sdcard", "./Storagecard/Media" }, - //{ "/opt/storage/sdcard/osp/share", "./ShareExt" }, - //{ "/opt/storage/sdcard/osp/share2", "./Share2Ext" }, + { "/opt/storage/sdcard/osp/share", "./ShareExt" }, + { "/opt/storage/sdcard/osp/share2", "./Share2Ext" }, { "\0", "./HomeExt" }, - //{ "\0", "./HomeExt/Share" }, - //{ "\0", "./HomeExt/Share2" }, + { "\0", "./HomeExt/Share" }, + { "\0", "./HomeExt/Share2" }, }; int i = 0; @@ -475,7 +475,6 @@ mount_osp_external_paths(const char* app_rootpath, const char* pkgid) strncat(osp_ext_apps_pkgid_path, "apps/", 5); strncat(osp_ext_apps_pkgid_path, pkgid, strlen(pkgid)); -#if 0 strncpy(osp_ext_share_pkgid_path, _EXT_OSP_HOME_PATH, strlen(_EXT_OSP_HOME_PATH)); strncat(osp_ext_share_pkgid_path, "share/", 6); strncat(osp_ext_share_pkgid_path, pkgid, strlen(pkgid)); @@ -487,9 +486,6 @@ mount_osp_external_paths(const char* app_rootpath, const char* pkgid) strncpy(mount_info[3].src_path, osp_ext_apps_pkgid_path, strlen(osp_ext_apps_pkgid_path)); strncpy(mount_info[4].src_path, osp_ext_share_pkgid_path, strlen(osp_ext_share_pkgid_path)); strncpy(mount_info[5].src_path, osp_ext_share2_pkgid_path, strlen(osp_ext_share2_pkgid_path)); -#else - strncpy(mount_info[1].src_path, osp_ext_apps_pkgid_path, strlen(osp_ext_apps_pkgid_path)); -#endif if (chdir(app_rootpath) != 0) { diff --git a/packaging/osp-env-config.spec b/packaging/osp-env-config.spec index 4c5c011..9a5602d 100755 --- a/packaging/osp-env-config.spec +++ b/packaging/osp-env-config.spec @@ -3,7 +3,7 @@ Summary: osp application environment cofiguration serivce Version: 1.2.1.0 Release: 2 Group: System/Libraries -License: Apache License, Version 2.0 or Flora +License: Apache-2.0 or Flora Source0: %{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: pkgconfig(dlog) @@ -20,9 +20,9 @@ osp application environment cofiguration serivce %build MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` %ifarch %{ix86} -CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ -D_OSP_EMUL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_OSP_X86_ -D_OSP_EMUL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} %else -CXXFLAGS="-O2 -g -pipe -Wall -fno-exceptions -Wformat -Wformat-security -Wl,--as-needed -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb -funwind-tables -D_OSP_DEBUG_ -D_OSP_ARMEL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +CXXFLAGS="-O2 -g -pipe -Wall -fno-exceptions -Wformat -Wformat-security -Wl,--as-needed -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb -funwind-tables -D_OSP_DEBUG_ -D_OSP_ARMEL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} %endif # Call make instruction with smp support @@ -43,5 +43,5 @@ cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2 %{buildroot}/usr/share/license %files %manifest osp-env-config.manifest /usr/share/license/%{name} -/usr/lib/*.so* +%{_libdir}/*.so* |