Update gbs.conf with the latest

This updates gbs.conf for product TV and DA.

Change-Id: I80b9f1339eccb372200f0623346ade5427f62d99
Signed-off-by: Youngsoo Choi <kenshin.choi@samsung.com>

diff --git a/tizen/build/common.sh b/tizen/build/common.sh
index e3c3137..472ebe7 100755 (executable)
--- a/tizen/build/common.sh
+++ b/tizen/build/common.sh
@@ -4,22 +4,17 @@ export SCRIPTDIR=$(readlink -e $(dirname $0))
 export TOPDIR=$(readlink -f "${SCRIPTDIR}/../..")
 export CHROME_SRC="${TOPDIR}"
 
-# Please set DEFAULT_TIZEN_VERSION to empty value for the latest tizen version
-# or set DEFAULT_TIZEN_VERSION to current tizen version for the others.
-export DEFAULT_TIZEN_VERSION=latest
+export LATEST_TIZEN_VERSION=6.0
+export DEFAULT_TIZEN_VERSION=$LATEST_TIZEN_VERSION
 
 if [ "$(echo "$@" | grep -e "--tizen")" != "" ]; then
   tizen_version=$(echo $@ | sed -e 's#.*--tizen_\([0-9.]*\).*#\1#')
-  if $(echo $tizen_version | grep -qe "^[-\?[0-9]\+\.\?[0-9]*$" && echo true || echo false); then
-    DEFAULT_TIZEN_VERSION=$tizen_version
-  else
-    DEFAULT_TIZEN_VERSION=latest
-  fi
+  DEFAULT_TIZEN_VERSION=$tizen_version
 fi
 
 # Generate gbs.conf
 export REPO_VERSION=
-if [ "$(echo $DEFAULT_TIZEN_VERSION)" != "latest" ]; then
+if [ "$DEFAULT_TIZEN_VERSION" != "${LATEST_TIZEN_VERSION}" ]; then
   REPO_VERSION=$DEFAULT_TIZEN_VERSION-
 fi
 sed -e "s/@TIZEN_VERSION@/$REPO_VERSION/g" \
@@ -66,9 +61,9 @@ function setupAndExecuteTargetBuild() {
 
   if [ "$PROFILE" == "" ]; then
     if [[ $platform == "tv" ]]; then
-      PROFILE=tztv_6.0_arm-nikem
+      PROFILE=tztv_${DEFAULT_TIZEN_VERSION}_arm-nikem
     elif [[ $platform == "da" ]]; then
-      PROFILE=tzda_5.5_arm-kantm
+      PROFILE=tzda_${DEFAULT_TIZEN_VERSION}_arm-kantm
     elif [[ $platform == "wearable" ]]; then
       PROFILE=tzwr_5.5_arm-spin
     else

diff --git a/tizen/build/gbs.conf.in b/tizen/build/gbs.conf.in
index 93e23ff..b9c94fd 100755 (executable)
--- a/tizen/build/gbs.conf.in
+++ b/tizen/build/gbs.conf.in
@@ -94,28 +94,6 @@ passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==
 
 ###############################################
 #
-# Tizen v5.5 product DA
-#
-#DA Family Hub 5.5 kantm
-[repo.da_product_5.5_fhub_kantm]
-url = http://10.113.136.26/snapshots/DA/Tizen-5.5/Tizen-5.5-DA-FHUB5/latest/repos/KANTM/packages/
-
-#Tizen 5.5 Base
-[repo.da_product_5.5_base]
-url = http://download.tizen.org/snapshots/tizen/5.5-base/latest/repos/standard/packages/
-
-###############################################
-#
-# Tizen v5.5 product DA (armv7l)
-#
-[profile.tzda_5.5_arm-kantm]
-repos = repo.da_product_5.5_base, repo.da_product_5.5_fhub_kantm
-buildroot = ~/GBS-ROOT-M63-TZDA_ARM-KANTM-TIZEN_LATEST-RELEASE
-user = blinkbot
-passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==
-
-###############################################
-#
 # Tizen product tv
 #
 [obs.tizen_product_tv]
@@ -136,7 +114,7 @@ user = blinkbot
 passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==
 
 [repo.tv_product_6.0_nikem]
-url = http://168.219.244.109/hijacks/PRECEDENCE/20_Tizen_6.0_Integration/latest
+url = http://168.219.244.109/products/tv/archive/2021/ONEMAIN/NikeM/latest
 user = blinkbot
 passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==
 
@@ -150,12 +128,12 @@ repos = repo.tv_product_5.5_nikem, repo.tv_product_5.5_base
 buildroot = ~/GBS-ROOT-5.5-TV-PRODUCT-NIKEM
 
 [repo.tv_product_5.5_base]
-url = http://168.219.244.109/base/current/standard/latest/repos/base/armv7l/packages/
+url = http://168.219.244.109/base/tizen-5.5-base-main/standard/latest
 user = blinkbot
 passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==
 
 [repo.tv_product_5.5_nikem]
-url = http://168.219.244.109/products/tv/archive/current/ONEMAIN/NikeM/latest/repos/product/armv7l/packages/
+url = http://168.219.244.109/products/tv/archive/2020/ONEMAIN/NikeM/latest
 user = blinkbot
 passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==
 
@@ -195,3 +173,47 @@ url=http://168.219.245.245/base/tizen-5.5-base-main/emulator32/latest/repos/base
 
 [repo.product_2018_Emulator]
 url=http://168.219.245.245/products/tv/archive/2020/ONEMAIN/emulator32/latest/repos/product/ia32/packages/
+
+###############################################
+#
+# Tizen v6.0 product DA
+#
+#DA Family Hub 6.0 kantm
+[repo.da_product_6.0_fhub_kantm]
+url = http://10.113.136.26/snapshots/DA/Tizen-6.0/Tizen-6.0-DA-FHUB/reference/repos/KANTM/packages/
+
+#Tizen 6.0 Base
+[repo.da_product_6.0_base]
+url = http://download.tizen.org/snapshots/tizen/base/latest/repos/standard/packages/
+
+###############################################
+#
+# Tizen v6.0 product DA (armv7l)
+#
+[profile.tzda_6.0_arm-kantm]
+repos = repo.da_product_6.0_base, repo.da_product_6.0_fhub_kantm
+buildroot = ~/GBS-ROOT-M76-TZDA_ARM-KANTM-TIZEN_LATEST-RELEASE
+user = blinkbot
+passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==
+
+###############################################
+#
+# Tizen v5.5 product DA
+#
+#DA Family Hub 5.5 kantm
+[repo.da_product_5.5_fhub_kantm]
+url = http://10.113.136.26/snapshots/DA/Tizen-5.5/Tizen-5.5-DA-FHUB5/latest/repos/KANTM/packages/
+
+#Tizen 5.5 Base
+[repo.da_product_5.5_base]
+url = http://download.tizen.org/snapshots/tizen/5.5-base/latest/repos/standard/packages/
+
+###############################################
+#
+# Tizen v5.5 product DA (armv7l)
+#
+[profile.tzda_5.5_arm-kantm]
+repos = repo.da_product_5.5_base, repo.da_product_5.5_fhub_kantm
+buildroot = ~/GBS-ROOT-M63-TZDA_ARM-KANTM-TIZEN_LATEST-RELEASE
+user = blinkbot
+passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==