From 0d46c9e456ba70359fd08245a3526e976c7aaf73 Mon Sep 17 00:00:00 2001 From: "jk7744.park" Date: Fri, 4 Mar 2016 19:53:34 +0900 Subject: [PATCH] Tizen 2.4.0 rev3 SDK Public Release --- CMakeLists.txt | 4 ---- backend/src/coretpk/coretpk-installer.c | 2 -- packaging/rpm-installer.spec | 7 ------- 3 files changed, 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ff7a293..3367598 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,10 +41,6 @@ IF(_APPFW_FEATURE_SUPPORT_ONLYCAP) ADD_DEFINITIONS("-D_APPFW_FEATURE_SUPPORT_ONLYCAP") ENDIF(_APPFW_FEATURE_SUPPORT_ONLYCAP) -IF(_APPFW_FEATURE_PKGNAME_RESTRICTION) - ADD_DEFINITIONS("-D_APPFW_FEATURE_PKGNAME_RESTRICTION") -ENDIF(_APPFW_FEATURE_PKGNAME_RESTRICTION) - IF(_APPFW_FEATURE_DIRECTORY_PERMISSION_OPT_ONLY) ADD_DEFINITIONS("-D_APPFW_FEATURE_DIRECTORY_PERMISSION_OPT_ONLY") ENDIF(_APPFW_FEATURE_DIRECTORY_PERMISSION_OPT_ONLY) diff --git a/backend/src/coretpk/coretpk-installer.c b/backend/src/coretpk/coretpk-installer.c index 0938803..f870077 100755 --- a/backend/src/coretpk/coretpk-installer.c +++ b/backend/src/coretpk/coretpk-installer.c @@ -2828,14 +2828,12 @@ int _coretpk_installer_install_package(const char *pkgfile, const pkginfo * pkg_ _installer_util_delete_dir(root_path); } -#ifdef _APPFW_FEATURE_PKGNAME_RESTRICTION /*pkgid should not be same with SMACK label used by system*/ if (security_server_check_domain_name(pkgid) == SECURITY_SERVER_API_SUCCESS) { _LOGE("Cannot install this pkg[%s] : It has invalid pkg name", pkgid); ret = RPM_INSTALLER_ERR_INTERNAL; goto err; } -#endif /* pre_install */ ret = __pre_install_for_mmc(pkgid, pkgfile, &dir_list, &handle, pkg_file_info->install_location); diff --git a/packaging/rpm-installer.spec b/packaging/rpm-installer.spec index ffc4faf..ac0b16e 100755 --- a/packaging/rpm-installer.spec +++ b/packaging/rpm-installer.spec @@ -47,12 +47,10 @@ Requires: cpio %if "%{?tizen_profile_name}" == "tv" %define appfw_feature_support_onlycap 0 %define appfw_feature_support_debugmode_for_sdk 0 -%define appfw_feature_pkgname_restriction 0 %define appfw_feature_directory_permission_opt_only 1 %else %define appfw_feature_support_onlycap 1 %define appfw_feature_support_debugmode_for_sdk 1 -%define appfw_feature_pkgname_restriction 1 %define appfw_feature_directory_permission_opt_only 0 %endif @@ -109,10 +107,6 @@ _SUPPORT_DEBUGMODE_FOR_SDK=ON _SUPPORT_DEBUGMODE_FOR_SDK=OFF %endif -%if 0%{?appfw_feature_pkgname_restriction} -_APPFW_FEATURE_PKGNAME_RESTRICTION=ON -%endif - %if 0%{?appfw_feature_directory_permission_opt_only} _APPFW_FEATURE_DIRECTORY_PERMISSION_OPT_ONLY=ON %else @@ -137,7 +131,6 @@ cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -D_APPFW_FEATURE_MOUNT_INSTALL:BOOL=${_MOUNT_INSTALL} \ -D_APPFW_FEATURE_SUPPORT_DEBUGMODE_FOR_SDK:BOOL=${_SUPPORT_DEBUGMODE_FOR_SDK} \ -D_APPFW_FEATURE_SUPPORT_ONLYCAP:BOOL=${_SUPPORT_ONLYCAP} \ - -D_APPFW_FEATURE_PKGNAME_RESTRICTION:BOOL=${_APPFW_FEATURE_PKGNAME_RESTRICTION} \ -D_APPFW_FEATURE_DIRECTORY_PERMISSION_OPT_ONLY:BOOL=${_APPFW_FEATURE_DIRECTORY_PERMISSION_OPT_ONLY} make %{?jobs:-j%jobs} -- 2.7.4