From 8fe09afd60b78a02a30212ff813209cf6ecd7133 Mon Sep 17 00:00:00 2001 From: Youngsoo Choi Date: Thu, 20 Feb 2020 17:17:27 -0800 Subject: [PATCH] Set default gbs repository to tizen 6.0 This sets default gbs repository to tizen 6.0 for public targets and product tv. Change-Id: I89b37a76a4af872988fb8d3b7590262d732932e5 Signed-off-by: Youngsoo Choi --- tizen/build/common.sh | 15 ++++----------- tizen/build/gbs.conf.in | 31 +++++++++++++++++++++++++------ 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/tizen/build/common.sh b/tizen/build/common.sh index bd7ac97..806ed5d 100755 --- a/tizen/build/common.sh +++ b/tizen/build/common.sh @@ -6,7 +6,7 @@ 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=5.5 +export DEFAULT_TIZEN_VERSION=latest if [ "$(echo "$@" | grep -e "--tizen")" != "" ]; then tizen_version=$(echo $@ | sed -e 's#.*--tizen_\([0-9.]*\).*#\1#') @@ -60,18 +60,11 @@ function setupAndExecuteTargetBuild() { if [ "$PROFILE" == "" ]; then if [[ $platform == "tv" ]]; then - if [ "$DEFAULT_TIZEN_VERSION" == "5.5" ]; then - # FIXME: The latest version of platform hasn't been released yet. - PROFILE=tztv_5.5_arm-nikem - fi + PROFILE=tztv_6.0_arm-nikem elif [[ $platform == "da" ]]; then - if [ "$DEFAULT_TIZEN_VERSION" == "5.5" ]; then - PROFILE=tzda_5.5_arm-kantm - fi + PROFILE=tzda_5.5_arm-kantm elif [[ $platform == "wearable" ]]; then - if [ "$DEFAULT_TIZEN_VERSION" == "5.5" ]; then - PROFILE=tzwr_5.5_spin - fi + PROFILE=tzwr_5.5_arm-spin else echo "Cannot set default PROFILE for platform=${platform}" exit 1 diff --git a/tizen/build/gbs.conf.in b/tizen/build/gbs.conf.in index c97b0ec..a25b8c4 100755 --- a/tizen/build/gbs.conf.in +++ b/tizen/build/gbs.conf.in @@ -40,7 +40,7 @@ passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ== [profile.tz_standard] obs = obs.tizen repos = repo.public_base_standard, repo.tz_standard -buildroot = ~/GBS-ROOT-M69-TZ_STANDARD +buildroot = ~/GBS-ROOT-WRTJS-TZ_STANDARD ############################################### # @@ -49,7 +49,7 @@ buildroot = ~/GBS-ROOT-M69-TZ_STANDARD [profile.tz_emulator] obs = obs.tizen repos = repo.public_base_standard, repo.tz_emulator -buildroot = ~/GBS-ROOT-M69-TZ_EMULATOR +buildroot = ~/GBS-ROOT-WRTJS-TZ_EMULATOR ############################################### # @@ -58,7 +58,7 @@ buildroot = ~/GBS-ROOT-M69-TZ_EMULATOR [profile.tz_standard_mirror] obs = obs.tizen repos = repo.public_base_standard_mirror, repo.tz_standard_mirror -buildroot = ~/GBS-ROOT-M69-TZ_STANDARD-TIZEN_LATEST-RELEASE +buildroot = ~/GBS-ROOT-WRTJS-TZ_STANDARD ############################################### # @@ -67,7 +67,7 @@ buildroot = ~/GBS-ROOT-M69-TZ_STANDARD-TIZEN_LATEST-RELEASE [profile.tz_emulator_mirror] obs = obs.tizen repos = repo.public_base_standard, repo.tz_emulator_mirror -buildroot = ~/GBS-ROOT-M69-TZ_EMULATOR-TIZEN_LATEST-RELEASE +buildroot = ~/GBS-ROOT-WRTJS-TZ_EMULATOR ############################################### # @@ -86,9 +86,9 @@ url = http://165.213.149.200/download/snapshots/tizen/base-wearable/latest/repos # # Tizen v5.5 spin Wearable (armv7l) # -[profile.tzwr_5.5_spin] +[profile.tzwr_5.5_arm-spin] repos = repo.wearable_product_5.5_base, repo.wearable_product_5.5 -buildroot = ~/GBS-ROOT-M69-TZWR_5.5_SPIN-TIZEN_LATEST-RELEASE +buildroot = ~/GBS-ROOT-WRTJS-TZWR_5.5_SPIN-TIZEN_LATEST-RELEASE user = blinkbot passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ== @@ -123,6 +123,25 @@ url = https://168.219.243.64/api ############################################ # +# Tizen v6.0 for product tv (NikeM armv7l) +# +[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 + +[repo.tv_product_6.0_base] +url = http://168.219.244.109/base/current/standard/latest/repos/base/armv7l/packages/ +user = blinkbot +passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ== + +[repo.tv_product_6.0_nikem] +url = http://168.219.244.109/products/tv/archive/current/ONEMAIN/NikeM/latest/repos/product/armv7l/packages/ +user = blinkbot +passwdx = QlpoOTFBWSZTWd0JOhUAAACBAABgIAAhAIIjF3JFOFCQ3Qk6FQ== + +############################################ +# # Tizen v5.5 for product tv (NikeM armv7l) # [profile.tztv_5.5_arm-nikem] -- 2.7.4