From 2ba2b0236d1b26f73b5e076a2285d1202411157f Mon Sep 17 00:00:00 2001
From: James Le Cuirot <jlecuirot@microsoft.com>
Date: Wed, 17 Jul 2024 11:24:20 +0100
Subject: [PATCH 1/2] Move Catalyst upgrade inside catalyst_init and add --jobs
 option

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>
---
 build_library/catalyst.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/build_library/catalyst.sh b/build_library/catalyst.sh
index 4706007c40..4512091dfc 100644
--- a/build_library/catalyst.sh
+++ b/build_library/catalyst.sh
@@ -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
@@ -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")

From 36d0432a20c9a2db6c4831fd48f24a9745ed99c5 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <jlecuirot@microsoft.com>
Date: Wed, 17 Jul 2024 11:31:43 +0100
Subject: [PATCH 2/2] Add Catalyst 4 dependencies to package automation list

Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
---
 .github/workflows/portage-stable-packages-list | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/portage-stable-packages-list b/.github/workflows/portage-stable-packages-list
index b0eb2967c8..c956de7742 100644
--- a/.github/workflows/portage-stable-packages-list
+++ b/.github/workflows/portage-stable-packages-list
@@ -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
@@ -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
 
@@ -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