fixup! Switch to TV 3.0 as the default target for build_tv.sh

Move extra python package handling to common.sh. Without it build
without -P tztv_v3.0 would still fail as PROFILE_NAME did not have any
default values in build_tv.sh.

Change-Id: I95b507d4156ac8aff6fe6335d7b9d7b3e4047421
Signed-off-by: Piotr Tworek <p.tworek@samsung.com>
Signed-off-by: hh4813.kim <hh4813.kim@samsung.com>

diff --git a/tizen_src/build/build_tv.sh b/tizen_src/build/build_tv.sh
index 147cc2a..5074bcd 100755 (executable)
--- a/tizen_src/build/build_tv.sh
+++ b/tizen_src/build/build_tv.sh
@@ -2,11 +2,4 @@
 
 . `dirname $0`/common.sh
 
-PROFILE_NAME=$(echo "$@" | grep -Po "(?<=\-P\s)[^\s]*" || :)
-
-EXTRA_PACK_OPTS="--extra-packs python-base-x86-arm,python-x86-arm,python-xml-x86-arm"
-if [ "$PROFILE_NAME" == "tztv_v3.0" ]; then
-   EXTRA_PACK_OPTS=""
-fi
-
-setupAndExecuteTargetBuild tv "$@" $EXTRA_PACK_OPTS
+setupAndExecuteTargetBuild tv "$@"

diff --git a/tizen_src/build/common.sh b/tizen_src/build/common.sh
index def2cb0..42f020f 100755 (executable)
--- a/tizen_src/build/common.sh
+++ b/tizen_src/build/common.sh
@@ -204,8 +204,13 @@ function setupAndExecuteTargetBuild() {
     CONF_FLAG="--conf ${SCRIPTDIR}/gbs.conf"
   fi
 
+  EXTRA_PACK_OPTS=""
+  if [ "$PROFILE_NAME" == "tztv_v2.2.1_prehawk" ]; then
+    EXTRA_PACK_OPTS="--extra-packs python-base-x86-arm,python-x86-arm,python-xml-x86-arm"
+  fi
+
   cd $TOPDIR
   rm -f packaging
   ln -sf tizen_src/packaging packaging
-  gbs $CONF_FLAG build $PROFILE_FLAG -A $ARCHITECTURE --incremental "${@}"
+  gbs $CONF_FLAG build $PROFILE_FLAG -A $ARCHITECTURE --incremental "${@}" $EXTRA_PACK_OPTS
 }