mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-11 15:06:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #178 from flatcar-linux/jepio/update-chroot-setuponly

Browse Source 
update_chroot: introduce '--setuponly' flag
This commit is contained in:
Jeremi Piotrowski 2021-10-26 13:53:41 +02:00 committed by GitHub
commit 50ed7f3007
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jenkins/sdk.sh
View File

@ -48,7 +48,7 @@ bin/cork update \
--sdk-url storage.googleapis.com \ --sdk-url storage.googleapis.com \
--sdk-url-path "/flatcar-jenkins/sdk" \ --sdk-url-path "/flatcar-jenkins/sdk" \
--manifest-name "${MANIFEST_NAME}" \ --manifest-name "${MANIFEST_NAME}" \
--manifest-url "${MANIFEST_URL}" -- --dev_builds_sdk="${DOWNLOAD_ROOT_SDK}" --manifest-url "${MANIFEST_URL}" -- --dev_builds_sdk="${DOWNLOAD_ROOT_SDK}" --setuponly
if [[ ${FULL_BUILD} == "false" ]]; then if [[ ${FULL_BUILD} == "false" ]]; then
export FORCE_STAGES="stage4" export FORCE_STAGES="stage4"

2
jenkins/toolchains.sh
View File

@ -69,7 +69,7 @@ export FLATCAR_BUILD_ID
enter gangue get --verify-key /opt/verify.asc --json-key /etc/portage/gangue.json "${DOWNLOAD_ROOT_SDK}/amd64/${FLATCAR_SDK_VERSION}/flatcar-sdk-amd64-${FLATCAR_SDK_VERSION}.tar.bz2.DIGESTS" /mnt/host/source/.cache/sdks/ enter gangue get --verify-key /opt/verify.asc --json-key /etc/portage/gangue.json "${DOWNLOAD_ROOT_SDK}/amd64/${FLATCAR_SDK_VERSION}/flatcar-sdk-amd64-${FLATCAR_SDK_VERSION}.tar.bz2.DIGESTS" /mnt/host/source/.cache/sdks/
script update_chroot \ script update_chroot \
--toolchain_boards="${BOARD}" --dev_builds_sdk="${DOWNLOAD_ROOT_SDK}" --toolchain_boards="${BOARD}" --dev_builds_sdk="${DOWNLOAD_ROOT_SDK}" --setuponly
# Set up GPG for signing uploads. # Set up GPG for signing uploads.
gpg --import "${GPG_SECRET_KEY_FILE}" gpg --import "${GPG_SECRET_KEY_FILE}"

7
update_chroot
View File

@ -24,6 +24,8 @@ DEFINE_boolean workon "${FLAGS_TRUE}" \
"Automatically rebuild updated cros-workon packages." "Automatically rebuild updated cros-workon packages."
DEFINE_boolean skip_toolchain_update "${FLAGS_FALSE}" \ DEFINE_boolean skip_toolchain_update "${FLAGS_FALSE}" \
"Don't update the toolchains." "Don't update the toolchains."
DEFINE_boolean setuponly "${FLAGS_FALSE}" \
"Only configure portage, without updating packages. Useful when only boostrap_sdk/build_toolchains will be called"
DEFINE_string toolchain_boards "" \ DEFINE_string toolchain_boards "" \
"Extra toolchains to setup for the specified boards." "Extra toolchains to setup for the specified boards."
DEFINE_string dev_builds_sdk "" \ DEFINE_string dev_builds_sdk "" \
@ -216,6 +218,11 @@ sudo -E ${EMERGE_CMD} --quiet "${EMERGE_FLAGS[@]}" \
gcc_set_latest_profile "$(portageq envvar CHOST)" gcc_set_latest_profile "$(portageq envvar CHOST)"
if [[ "${FLAGS_setuponly}" -eq "${FLAGS_TRUE}" ]]; then
command_completed
exit 0
fi
if [[ "${FLAGS_skip_toolchain_update}" -eq "${FLAGS_FALSE}" && \ if [[ "${FLAGS_skip_toolchain_update}" -eq "${FLAGS_FALSE}" && \
-n "${FLAGS_toolchain_boards}" ]]; then -n "${FLAGS_toolchain_boards}" ]]; then
CROSS_CHOSTS=( $(get_board_chost ${FLAGS_toolchain_boards} | sort -u) ) CROSS_CHOSTS=( $(get_board_chost ${FLAGS_toolchain_boards} | sort -u) )