[Product TV] Update gbs.conf with the official repos

The product gbs repo has been changed with the official repos.

The gbs root folders having regular pattern are using version macros
and the others are using specific tizen version numbers.

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

diff --git a/tizen/build/common.sh b/tizen/build/common.sh
index 472ebe7..aa48b4e 100755 (executable)
--- a/tizen/build/common.sh
+++ b/tizen/build/common.sh
@@ -8,16 +8,16 @@ 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#')
-  DEFAULT_TIZEN_VERSION=$tizen_version
+  DEFAULT_TIZEN_VERSION=$(echo $@ | sed -e 's#.*--tizen_\([0-9.]*\).*#\1#')
 fi
 
 # Generate gbs.conf
-export REPO_VERSION=
+export PUBLIC_REPO_VERSION=
 if [ "$DEFAULT_TIZEN_VERSION" != "${LATEST_TIZEN_VERSION}" ]; then
-  REPO_VERSION=$DEFAULT_TIZEN_VERSION-
+  PUBLIC_REPO_VERSION=$DEFAULT_TIZEN_VERSION-
 fi
-sed -e "s/@TIZEN_VERSION@/$REPO_VERSION/g" \
+sed -e "s/@PUBLIC_REPO_VERSION@/$PUBLIC_REPO_VERSION/g" \
+    -e "s/@TIZEN_VERSION@/$DEFAULT_TIZEN_VERSION/g" \
     tizen/build/gbs.conf.in > tizen/build/gbs.conf
 
 function setupAndExecuteTargetBuild() {

diff --git a/tizen/build/gbs.conf.in b/tizen/build/gbs.conf.in
index b9c94fd..881761e 100755 (executable)
--- a/tizen/build/gbs.conf.in
+++ b/tizen/build/gbs.conf.in
@@ -1,18 +1,18 @@
 ###############################################
 #
-# The Tizen public unified
+# The Tizen public unified (upper than 4.0)
 #
 [obs.tizen]
 url = https://api.tizen.org
 
 [repo.tz_standard]
-url = http://download.tizen.org/snapshots/tizen/@TIZEN_VERSION@unified/latest/repos/standard/packages/
+url = http://download.tizen.org/snapshots/tizen/@PUBLIC_REPO_VERSION@unified/latest/repos/standard/packages/
 
 [repo.tz_emulator]
-url = http://download.tizen.org/snapshots/tizen/@TIZEN_VERSION@unified/latest/repos/emulator/packages/
+url = http://download.tizen.org/snapshots/tizen/@PUBLIC_REPO_VERSION@unified/latest/repos/emulator/packages/
 
 [repo.public_base_standard]
-url = http://download.tizen.org/snapshots/tizen/@TIZEN_VERSION@base/latest/repos/standard/packages/
+url = http://download.tizen.org/snapshots/tizen/@PUBLIC_REPO_VERSION@base/latest/repos/standard/packages/
 
 ###############################################
 #
@@ -35,47 +35,51 @@ passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==
 
 ###############################################
 #
-# The Tizen public standard
+# The latest Tizen public standard
 #
 [profile.tz_standard]
 obs = obs.tizen
 repos = repo.public_base_standard, repo.tz_standard
-buildroot = ~/GBS-ROOT-WRTJS-TZ_STANDARD
+buildroot = ~/GBS-ROOT-TZ_@TIZEN_VERSION@_STANDARD
 
 ###############################################
 #
-# The Tizen public emulator
+# The latest Tizen public emulator
 #
 [profile.tz_emulator]
 obs = obs.tizen
 repos = repo.public_base_standard, repo.tz_emulator
-buildroot = ~/GBS-ROOT-WRTJS-TZ_EMULATOR
+buildroot = ~/GBS-ROOT-TZ_@TIZEN_VERSION@_EMULATOR
 
 ###############################################
 #
-# The Tizen public standard, Mirroring Server for HQ developers
+# The latest Tizen public standard, Mirroring Server for HQ developers
 #
 [profile.tz_standard_mirror]
 obs = obs.tizen
 repos = repo.public_base_standard_mirror, repo.tz_standard_mirror
-buildroot = ~/GBS-ROOT-WRTJS-TZ_STANDARD
+buildroot = ~/GBS-ROOT-TZ_@TIZEN_VERSION@_STANDARD
 
 ###############################################
 #
-# The Tizen public emulator, Mirroring Server for HQ developers
+# The latset Tizen public emulator, Mirroring Server for HQ developers
 #
 [profile.tz_emulator_mirror]
 obs = obs.tizen
 repos = repo.public_base_standard, repo.tz_emulator_mirror
-buildroot = ~/GBS-ROOT-WRTJS-TZ_EMULATOR
+buildroot = ~/GBS-ROOT-TZ_@TIZEN_VERSION@_EMULATOR
 
 ###############################################
 #
-# Tizen v5.5 spin Wearable
+# Tizen product wearable (spin)
 #
-[obs.spin_5.5]
+[obs.spin]
 url = http://10.113.136.201
 
+###############################################
+#
+# Tizen v5.5 spin Wearable
+#
 [repo.wearable_product_5.5]
 url = http://165.213.149.200/download/snapshots/tizen/tizen-wearable-R800/latest/repos/standard/packages/
 
@@ -87,8 +91,9 @@ url = http://165.213.149.200/download/snapshots/tizen/base-wearable/latest/repos
 # Tizen v5.5 spin Wearable (armv7l)
 #
 [profile.tzwr_5.5_arm-spin]
+obs = obs.spin
 repos = repo.wearable_product_5.5_base, repo.wearable_product_5.5
-buildroot = ~/GBS-ROOT-WRTJS-TZWR_5.5_SPIN-TIZEN_LATEST-RELEASE
+buildroot = ~/GBS-ROOT-TZWR_5.5_ARM-SPIN
 user = blinkbot
 passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==
 
@@ -106,7 +111,7 @@ url = https://168.219.243.64/api
 [profile.tztv_6.0_arm-nikem]
 obs = obs.tizen_product_tv
 repos = repo.tv_product_6.0_nikem, repo.tv_product_6.0_base
-buildroot = ~/GBS-ROOT-WRTJS-TZTV_6.0_ARM-NIKEM-TIZEN_LATEST-RELEASE
+buildroot = ~/GBS-ROOT-TZTV_6.0_ARM-NIKEM
 
 [repo.tv_product_6.0_base]
 url = http://168.219.244.109/tizen-rsa/tizen-6.0-base/standard/latest/
@@ -114,7 +119,7 @@ user = blinkbot
 passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==
 
 [repo.tv_product_6.0_nikem]
-url = http://168.219.244.109/products/tv/archive/2021/ONEMAIN/NikeM/latest
+url = http://168.219.244.109/products/tv/official/2021/ONEMAIN/NikeM/latest/
 user = blinkbot
 passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==
 
@@ -125,48 +130,26 @@ passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==
 [profile.tztv_5.5_arm-nikem]
 obs = obs.tizen_product_tv
 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/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/2020/ONEMAIN/NikeM/latest
-user = blinkbot
-passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==
-
-############################################
-#
-# Tizen v5.5 for product tv (MuseM armv7l)
-#
-[profile.tztv_5.5_arm-musem]
-obs = obs.tizen_product_tv
-repos = repo.tv_product_5.5_base, repo.tv_product_5.5_musem
-buildroot = ~/GBS-ROOT-5.5-TV-PRODUCT-MUSEM
+buildroot = ~/GBS-ROOT-TZTV_5.5_ARM-NIKEM
 
 [repo.tv_product_5.5_base]
 url = http://168.219.244.109/base/tizen-5.5-base-main/standard/latest/
 user = blinkbot
 passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==
 
-[repo.tv_product_5.5_musem]
-url = http://168.219.244.109/products/tv/archive/2020/ONEMAIN/MuseM/latest/
+[repo.tv_product_5.5_nikem]
+url = http://168.219.244.109/products/tv/official/2020/ONEMAIN/NikeM/latest/
 user = blinkbot
 passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==
 
-###############################################
+############################################################################################
 #
 # Tizen v5.5 for product tv (Emulator)
 #
-[obs.tizentv]
-url = https://168.219.243.64/api
-
 [profile.tztv_5.5_emulator]
-obs = obs.tizentv
+obs = obs.tizen_product_tv
 repos = repo.product_2018_Emulator, repo.base_2018
-buildroot = ~/GBS-ROOT-5.5-TV-PRODUCT-EMULATOR
+buildroot = ~/GBS-ROOT-TZTV_5.5_EMULATOR
 
 [repo.base_2018]
 url=http://168.219.245.245/base/tizen-5.5-base-main/emulator32/latest/repos/base/ia32/packages/
@@ -192,7 +175,7 @@ url = http://download.tizen.org/snapshots/tizen/base/latest/repos/standard/packa
 #
 [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
+buildroot = ~/GBS-ROOT-TZDA_6.0_ARM-KANTM
 user = blinkbot
 passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==
 
@@ -214,6 +197,6 @@ url = http://download.tizen.org/snapshots/tizen/5.5-base/latest/repos/standard/p
 #
 [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
+buildroot = ~/GBS-ROOT-TZDA_5.5_ARM-KANTM
 user = blinkbot
 passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ==