diff --git a/build_library/toolchain_util.sh b/build_library/toolchain_util.sh index cbec7e2bad..1024a4e2fb 100644 --- a/build_library/toolchain_util.sh +++ b/build_library/toolchain_util.sh @@ -175,14 +175,15 @@ get_sdk_binhost() { set -- "${FLATCAR_SDK_VERSION}" fi + FLATCAR_DEV_BUILDS_SDK="${FLATCAR_DEV_BUILDS_SDK-$FLATCAR_DEV_BUILDS/sdk}" for ver in "$@"; do # Usually only crossdev needs to be fetched from /toolchain/ in the setup_board step. # The entry for /pkgs/ is there if something needs to be reinstalled in the SDK # but normally it is not needed because everything is already part of the tarball. # To install the crossdev Rust package, /toolchain-arm64/ is derived from /toolchain/ # when necessary in install_cross_toolchain(). - echo "${FLATCAR_DEV_BUILDS}/sdk/${arch}/${ver}/toolchain/" - echo "${FLATCAR_DEV_BUILDS}/sdk/${arch}/${ver}/pkgs/" + echo "${FLATCAR_DEV_BUILDS_SDK}/${arch}/${ver}/toolchain/" + echo "${FLATCAR_DEV_BUILDS_SDK}/${arch}/${ver}/pkgs/" done } diff --git a/jenkins/images.sh b/jenkins/images.sh index 5335252536..8ce5393b45 100644 --- a/jenkins/images.sh +++ b/jenkins/images.sh @@ -12,6 +12,7 @@ enter() { sudo ln -f "${GS_DEVEL_CREDS}" chroot/etc/portage/gangue.json bin/cork enter --bind-gpg-agent=false -- env \ FLATCAR_DEV_BUILDS="${DOWNLOAD_ROOT}" \ + FLATCAR_DEV_BUILDS_SDK="${DOWNLOAD_ROOT_SDK}" \ {FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get \ --json-key=/etc/portage/gangue.json $verify_key \ "'"${URI}" "${DISTDIR}/${FILE}"' \ diff --git a/jenkins/packages.sh b/jenkins/packages.sh index 8820b47b57..352f74f598 100644 --- a/jenkins/packages.sh +++ b/jenkins/packages.sh @@ -16,6 +16,7 @@ enter() { CCACHE_DIR=/mnt/host/source/ccache \ CCACHE_MAXSIZE=5G \ FLATCAR_DEV_BUILDS="${DOWNLOAD_ROOT}" \ + FLATCAR_DEV_BUILDS_SDK="${DOWNLOAD_ROOT_SDK}" \ {FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get \ --json-key=/etc/portage/gangue.json $verify_key \ "'"${URI}" "${DISTDIR}/${FILE}"' \ diff --git a/jenkins/sdk.sh b/jenkins/sdk.sh index 2fe868bfb3..526c1d9f21 100644 --- a/jenkins/sdk.sh +++ b/jenkins/sdk.sh @@ -13,7 +13,7 @@ gpg --import "${GPG_SECRET_KEY_FILE}" # Wipe all of catalyst. sudo rm -rf src/build -enter sudo /mnt/host/source/src/scripts/bootstrap_sdk \ +enter sudo FLATCAR_DEV_BUILDS_SDK="${DOWNLOAD_ROOT_SDK}" /mnt/host/source/src/scripts/bootstrap_sdk \ --sign="${SIGNING_USER}" \ --sign_digests="${SIGNING_USER}" \ --upload_root="${UPLOAD_ROOT}" \ diff --git a/jenkins/toolchains.sh b/jenkins/toolchains.sh index 185cd95415..c7822619ff 100644 --- a/jenkins/toolchains.sh +++ b/jenkins/toolchains.sh @@ -13,7 +13,7 @@ gpg --import "${GPG_SECRET_KEY_FILE}" # Wipe all of catalyst. sudo rm -rf src/build -enter sudo /mnt/host/source/src/scripts/build_toolchains \ +enter sudo FLATCAR_DEV_BUILDS_SDK="${DOWNLOAD_ROOT_SDK}" /mnt/host/source/src/scripts/build_toolchains \ --sign="${SIGNING_USER}" \ --sign_digests="${SIGNING_USER}" \ --upload_root="${UPLOAD_ROOT}" \ diff --git a/jenkins/vm.sh b/jenkins/vm.sh index 1acfe58bcd..2526fc69bd 100644 --- a/jenkins/vm.sh +++ b/jenkins/vm.sh @@ -12,6 +12,7 @@ enter() { sudo ln -f "${GS_DEVEL_CREDS}" chroot/etc/portage/gangue.json bin/cork enter --bind-gpg-agent=false -- env \ FLATCAR_DEV_BUILDS="${GS_DEVEL_ROOT}" \ + FLATCAR_DEV_BUILDS_SDK="${DOWNLOAD_ROOT_SDK}" \ {FETCH,RESUME}COMMAND_GS="/usr/bin/gangue get \ --json-key=/etc/portage/gangue.json $verify_key \ "'"${URI}" "${DISTDIR}/${FILE}"' \ diff --git a/sdk_lib/sdk_util.sh b/sdk_lib/sdk_util.sh index 62c8066676..d58a182705 100644 --- a/sdk_lib/sdk_util.sh +++ b/sdk_lib/sdk_util.sh @@ -11,7 +11,8 @@ FLATCAR_SDK_ARCH="amd64" # We are unlikely to support anything else. FLATCAR_SDK_TARBALL="flatcar-sdk-${FLATCAR_SDK_ARCH}-${FLATCAR_SDK_VERSION}.tar.bz2" FLATCAR_SDK_TARBALL_CACHE="${REPO_CACHE_DIR}/sdks" FLATCAR_SDK_TARBALL_PATH="${FLATCAR_SDK_TARBALL_CACHE}/${FLATCAR_SDK_TARBALL}" -FLATCAR_SDK_URL="${FLATCAR_DEV_BUILDS}/sdk/${FLATCAR_SDK_ARCH}/${FLATCAR_SDK_VERSION}/${FLATCAR_SDK_TARBALL}" +FLATCAR_DEV_BUILDS_SDK="${FLATCAR_DEV_BUILDS_SDK-$FLATCAR_DEV_BUILDS/sdk}" +FLATCAR_SDK_URL="${FLATCAR_DEV_BUILDS_SDK}/${FLATCAR_SDK_ARCH}/${FLATCAR_SDK_VERSION}/${FLATCAR_SDK_TARBALL}" # Download the current SDK tarball (if required) and verify digests/sig sdk_download_tarball() { diff --git a/update_chroot b/update_chroot index 3e93c7e8fd..2f0cb492d7 100755 --- a/update_chroot +++ b/update_chroot @@ -27,6 +27,8 @@ DEFINE_boolean skip_toolchain_update "${FLAGS_FALSE}" \ "Don't update the toolchains." DEFINE_string toolchain_boards "" \ "Extra toolchains to setup for the specified boards." +DEFINE_string dev_builds_sdk "" \ + "Set FLATCAR_DEV_BUILDS_SDK which defaults to FLATCAR_DEV_BUILDS/sdk" DEFINE_string binhost "" \ "Use binary packages from a specific location (e.g. https://storage.googleapis.com/flatcar-jenkins/sdk/amd64/2000.0.0/pkgs)" @@ -53,6 +55,10 @@ if [[ "${FLAGS_usepkgonly}" -eq "${FLAGS_TRUE}" ]]; then FLAGS_workon="${FLAGS_FALSE}" fi +if [[ -n "${FLAGS_dev_builds_sdk}" ]]; then + FLATCAR_DEV_BUILDS_SDK="${FLAGS_dev_builds_sdk}" +fi + . "${BUILD_LIBRARY_DIR}/toolchain_util.sh" PORTAGE_STABLE_OVERLAY="${REPO_ROOT}/src/third_party/portage-stable"