mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-22 22:21:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

set_version: Set SDK URL to allow a release SDK with a dev board

Browse Source 
The SDK package URL is constructed from FLATCAR_DEV_BUILDS in
build_library/toolchain_util.sh which caused the --dev-board flag
also to imply --dev-sdk. Using --no-dev-sdk didn't help.
Document this and work around it by setting the SDK URL explicitly
with --no-dev-sdk.
This commit is contained in:
Kai Lüke 2020-07-16 17:04:51 +02:00
parent e04421cb59
commit 363239ff2d
No known key found for this signature in database
GPG Key ID: E5601DA3A1D902A8
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
set_version
View File

@ -4,6 +4,7 @@ set -euo pipefail
DEFAULT_BASE_URL="https://storage.googleapis.com/flatcar-jenkins" DEFAULT_BASE_URL="https://storage.googleapis.com/flatcar-jenkins"
DEV_BOARD_URL="${DEFAULT_BASE_URL}/developer" DEV_BOARD_URL="${DEFAULT_BASE_URL}/developer"
DEFAULT_SDK_URL="${DEFAULT_BASE_URL}/sdk"
DEV_SDK_URL="${DEFAULT_BASE_URL}/developer/sdk" DEV_SDK_URL="${DEFAULT_BASE_URL}/developer/sdk"
FILE=~/trunk/.repo/manifests/version.txt FILE=~/trunk/.repo/manifests/version.txt
FLATCAR_DEV_BUILDS_SDK="" FLATCAR_DEV_BUILDS_SDK=""
@ -23,10 +24,12 @@ Usage: $0 FLAGS...
referenced by referenced by
${DEV_BOARD_URL}/boards/BOARD/CHANNEL-nightly.txt ${DEV_BOARD_URL}/boards/BOARD/CHANNEL-nightly.txt
--dev-board: Set FLATCAR_DEV_BUILDS=${DEV_BOARD_URL} --dev-board: Set FLATCAR_DEV_BUILDS=${DEV_BOARD_URL}
which also selects --dev-sdk unless you specify
--no-dev-sdk
--no-dev-board: Remove existing FLATCAR_DEV_BUILDS --no-dev-board: Remove existing FLATCAR_DEV_BUILDS
--sdk-version VERSION: Set FLATCAR_SDK_VERSION=VERSION --sdk-version VERSION: Set FLATCAR_SDK_VERSION=VERSION
--dev-sdk: Set FLATCAR_DEV_BUILDS_SDK=${DEV_SDK_URL} --dev-sdk: Set FLATCAR_DEV_BUILDS_SDK=${DEV_SDK_URL}
--no-dev-sdk: Remove existing FLATCAR_DEV_BUILDS_SDK --no-dev-sdk: Use a release SDK even if --dev-board is specified
--file FILE: Modify another file than ${FILE}, useful if run --file FILE: Modify another file than ${FILE}, useful if run
outside of the SDK chroot. If /dev/stdout or outside of the SDK chroot. If /dev/stdout or
/dev/stderr is used, only new values are printed. /dev/stderr is used, only new values are printed.
@ -61,7 +64,7 @@ while [[ $# -gt 0 ]]; do
FLATCAR_DEV_BUILDS_SDK="${DEV_SDK_URL}" FLATCAR_DEV_BUILDS_SDK="${DEV_SDK_URL}"
;; ;;
--no-dev-sdk) --no-dev-sdk)
FLATCAR_DEV_BUILDS_SDK=no FLATCAR_DEV_BUILDS_SDK="${DEFAULT_SDK_URL}"
;; ;;
--file) --file)
FILE="$1" FILE="$1"
@ -87,5 +90,5 @@ fi
[[ -n "${FLATCAR_VERSION_ID}" ]] && echo "FLATCAR_VERSION_ID=${FLATCAR_VERSION_ID}" [[ -n "${FLATCAR_VERSION_ID}" ]] && echo "FLATCAR_VERSION_ID=${FLATCAR_VERSION_ID}"
[[ -n "${FLATCAR_DEV_BUILDS}" ]] && [[ "${FLATCAR_DEV_BUILDS}" != no ]] && echo "FLATCAR_DEV_BUILDS=${FLATCAR_DEV_BUILDS}" [[ -n "${FLATCAR_DEV_BUILDS}" ]] && [[ "${FLATCAR_DEV_BUILDS}" != no ]] && echo "FLATCAR_DEV_BUILDS=${FLATCAR_DEV_BUILDS}"
[[ -n "${FLATCAR_SDK_VERSION}" ]] && echo "FLATCAR_SDK_VERSION=${FLATCAR_SDK_VERSION}" [[ -n "${FLATCAR_SDK_VERSION}" ]] && echo "FLATCAR_SDK_VERSION=${FLATCAR_SDK_VERSION}"
[[ -n "${FLATCAR_DEV_BUILDS_SDK}" ]] && [[ "${FLATCAR_DEV_BUILDS_SDK}" != no ]] && echo "FLATCAR_DEV_BUILDS_SDK=${FLATCAR_DEV_BUILDS_SDK}" [[ -n "${FLATCAR_DEV_BUILDS_SDK}" ]] && echo "FLATCAR_DEV_BUILDS_SDK=${FLATCAR_DEV_BUILDS_SDK}"
} >> "${FILE}" } >> "${FILE}"