mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-14 16:37:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2133 from flatcar/chewi/catalyst-4-fixes

Browse Source 
Catalyst 4 upgrade follow up fixes
This commit is contained in:
James Le Cuirot 2024-07-19 18:18:10 +01:00 committed by GitHub
commit b04d424af2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/portage-stable-packages-list vendored
View File

@ -87,6 +87,7 @@ app-arch/lzop
app-arch/ncompress app-arch/ncompress
app-arch/pbzip2 app-arch/pbzip2
app-arch/pigz app-arch/pigz
app-arch/pixz
app-arch/rpm2targz app-arch/rpm2targz
app-arch/sharutils app-arch/sharutils
app-arch/tar app-arch/tar
@ -307,6 +308,7 @@ dev-python/setuptools
dev-python/setuptools-scm dev-python/setuptools-scm
dev-python/six dev-python/six
dev-python/snakeoil dev-python/snakeoil
dev-python/tomli
dev-python/trove-classifiers dev-python/trove-classifiers
dev-python/wheel dev-python/wheel
@ -575,6 +577,7 @@ sys-fs/mtools
sys-fs/multipath-tools sys-fs/multipath-tools
sys-fs/quota sys-fs/quota
sys-fs/squashfs-tools sys-fs/squashfs-tools
sys-fs/squashfs-tools-ng
sys-fs/udisks sys-fs/udisks
sys-fs/xfsprogs sys-fs/xfsprogs
sys-fs/zfs sys-fs/zfs

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")