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

Move Catalyst upgrade inside catalyst_init and add --jobs option

Browse Source 
catalyst.sh is a library file, so it shouldn't upgrade Catalyst until
actually taking action.

Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
This commit is contained in:
James Le Cuirot 2024-07-17 11:24:20 +01:00
parent 0463d58c63
commit 2ba2b0236d
No known key found for this signature in database
GPG Key ID: 1226415D00DD3137
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build_library/catalyst.sh
View File

@ -3,11 +3,6 @@
# Use of this source code is governed by a BSD-style license that can be # Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file. # found in the LICENSE file.
# Before doing anything, ensure we have at least Catalyst 4.
if catalyst --version | grep -q "Catalyst [0-3]\."; then
sudo emerge -v1 ">=dev-util/catalyst-4" || exit 1
fi
# common.sh should be sourced first # common.sh should be sourced first
[[ -n "${DEFAULT_BUILD_ROOT}" ]] || exit 1 [[ -n "${DEFAULT_BUILD_ROOT}" ]] || exit 1
. "${SCRIPTS_DIR}/sdk_lib/sdk_util.sh" || exit 1 . "${SCRIPTS_DIR}/sdk_lib/sdk_util.sh" || exit 1
@ -171,6 +166,11 @@ catalyst_init() {
die_notrace "catalyst not found, not installed or bad PATH?" die_notrace "catalyst not found, not installed or bad PATH?"
fi fi
# Before doing anything else, ensure we have at least Catalyst 4.
if catalyst --version | grep -q "Catalyst [0-3]\."; then
emerge --verbose "--jobs=${NUM_JOBS}" --oneshot ">=dev-util/catalyst-4" || exit 1
fi
DEBUG=() DEBUG=()
if [[ ${FLAGS_debug} -eq ${FLAGS_TRUE} ]]; then if [[ ${FLAGS_debug} -eq ${FLAGS_TRUE} ]]; then
DEBUG=("--debug") DEBUG=("--debug")