Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Catalyst 4 upgrade follow up fixes #2133

Merged
merged 2 commits into from
Jul 19, 2024
Merged

Catalyst 4 upgrade follow up fixes #2133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2ba2b02
Move Catalyst upgrade inside catalyst_init and add --jobs option
chewi Jul 17, 2024
36d0432
Add Catalyst 4 dependencies to package automation list
chewi Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .github/workflows/portage-stable-packages-list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ app-arch/lzop
app-arch/ncompress
app-arch/pbzip2
app-arch/pigz
app-arch/pixz
app-arch/rpm2targz
app-arch/sharutils
app-arch/tar
Expand Down Expand Up @@ -307,6 +308,7 @@ dev-python/setuptools
dev-python/setuptools-scm
dev-python/six
dev-python/snakeoil
dev-python/tomli
dev-python/trove-classifiers
dev-python/wheel

Expand Down Expand Up @@ -575,6 +577,7 @@ sys-fs/mtools
sys-fs/multipath-tools
sys-fs/quota
sys-fs/squashfs-tools
sys-fs/squashfs-tools-ng
sys-fs/udisks
sys-fs/xfsprogs
sys-fs/zfs
Expand Down
10 changes: 5 additions & 5 deletions build_library/catalyst.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
# Use of this source code is governed by a BSD-style license that can be
# 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
[[ -n "${DEFAULT_BUILD_ROOT}" ]] || exit 1
. "${SCRIPTS_DIR}/sdk_lib/sdk_util.sh" || exit 1
Expand Down Expand Up @@ -171,6 +166,11 @@ catalyst_init() {
die_notrace "catalyst not found, not installed or bad PATH?"
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=()
if [[ ${FLAGS_debug} -eq ${FLAGS_TRUE} ]]; then
DEBUG=("--debug")
Expand Down
Loading