From: Alexander Aksenov Date: Fri, 21 Aug 2015 08:53:50 +0000 (+0300) Subject: [IMPROVE] Remove debug pkgs dependency for Rainbow X-Git-Tag: submit/tizen/20151105.065919~28 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8bc4d59e7f35a6d072302877fe1a3e06629c5548;p=platform%2Fcore%2Fsystem%2Fswap-manager.git [IMPROVE] Remove debug pkgs dependency for Rainbow Change-Id: I4b2e058c3c4595d61877a69d27869c855776144c Signed-off-by: Alexander Aksenov --- diff --git a/packaging/swap-manager.spec b/packaging/swap-manager.spec index fae67ef..46fb01b 100644 --- a/packaging/swap-manager.spec +++ b/packaging/swap-manager.spec @@ -22,14 +22,18 @@ BuildRequires: swap-probe-devel BuildRequires: swap-probe-elf %if "%{?tizen_profile_name}" == "tv" BuildRequires: webkit2-efl-tv +%if "%{TIZEN_PRODUCT_TV}" != "1" BuildRequires: webkit2-efl-tv-debuginfo +%endif %else BuildRequires: webkit2-efl BuildRequires: webkit2-efl-debuginfo %endif BuildRequires: launchpad BuildRequires: app-core-efl +%if "%{TIZEN_PRODUCT_TV}" != "1" BuildRequires: app-core-debuginfo +%endif %if "%_project" != "Kirana_SWA_OPEN:Build" && "%_project" != "Kirana_SWA_OPEN:Daily" Requires: swap-modules %endif @@ -47,6 +51,7 @@ This binary will be installed in target. %build pushd scripts echo "__tizen_profile_name__="%{?tizen_profile_name} > dyn_vars +echo "__tizen_product_tv__="%{?TIZEN_PRODUCT_TV} >> dyn_vars popd cd daemon diff --git a/scripts/gen_nsp_data.sh b/scripts/gen_nsp_data.sh index 49c200b..232a3da 100755 --- a/scripts/gen_nsp_data.sh +++ b/scripts/gen_nsp_data.sh @@ -30,12 +30,19 @@ check_null_or_exit() fi } +script_dir=$(readlink -f $0 | xargs dirname) +source $script_dir/dyn_vars + # get libappcore-efl.so path path_app_core_efl=$(rpm -ql app-core-efl | grep libappcore-efl | head -1) check_null_or_exit path_app_core_efl # get libappcore-efl.so debug_path -dpath_app_core_efl=$(rpm -ql app-core-debuginfo | grep "libappcore-efl\.so\.debug$" | head -1) +if [ "$__tizen_product_tv__" == "1" ]; then + dpath_app_core_efl=$path_app_core_efl +else + dpath_app_core_efl=$(rpm -ql app-core-debuginfo | grep "libappcore-efl\.so\.debug$" | head -1) +fi check_null_or_exit dpath_app_core_efl # get launchpad path diff --git a/scripts/gen_wsi_prof.sh b/scripts/gen_wsi_prof.sh index bc95602..9c1467a 100755 --- a/scripts/gen_wsi_prof.sh +++ b/scripts/gen_wsi_prof.sh @@ -25,7 +25,13 @@ if [ "$__tizen_profile_name__" == "tv" ]; then else webkit_package_name=webkit2-efl fi -lib_file=$(rpm -ql ${webkit_package_name}-debuginfo | grep "/usr/lib/debug/usr/lib/libewebkit2.so.debug$" | head -1) + +if [ "$__tizen_product_tv__" == "1" ]; then + lib_file=$(rpm -ql ${webkit_package_name} | grep "/usr/lib/libewebkit2.so$" | head -1) +else + lib_file=$(rpm -ql ${webkit_package_name}-debuginfo | grep "/usr/lib/debug/usr/lib/libewebkit2.so.debug$" | head -1) +fi + tmp=$(mktemp) func_names=() diff --git a/scripts/gen_wsp_data.sh b/scripts/gen_wsp_data.sh index d6a1241..7d1cd95 100755 --- a/scripts/gen_wsp_data.sh +++ b/scripts/gen_wsp_data.sh @@ -11,7 +11,13 @@ else fi path_libewebkit2=`rpm -ql $webkit_package_name | grep "libewebkit2.so$" | head -1` -path_libewebkit2_debuginfo=`rpm -ql ${webkit_package_name}-debuginfo | grep "libewebkit2.so.debug$" | head -1` + +if [ "$__tizen_profile_name__" == "1" ]; then + path_libewebkit2_debuginfo=$path_libewebkit2 +else + path_libewebkit2_debuginfo=`rpm -ql ${webkit_package_name}-debuginfo | grep "libewebkit2.so.debug$" | head -1` +fi + g_names=()