From 1d589ca9d8c01097b7cbe4be8aafa42d40a9754f Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Wed, 26 Apr 2023 07:44:19 +0200
Subject: [PATCH 1/2] build_library/update_chroot_util.sh: Ignore equery's
 non-zero exit status

The `list` command of `equery` will exit with status 3 if a package is
not found and `--quiet` is in effect. This results in some non-fatal
noise during the SDK build:

INFO    update_chroot: Maybe removing some hard blocks
ERROR   update_chroot: script called: update_chroot '--toolchain_boards=arm64-usr' '--usepkg' '--nousepkgonly' '--getbinpkg'
ERROR   update_chroot: Backtrace:  (most recent call is last)
ERROR   update_chroot:   file update_chroot, line 250, called: remove_hard_blocks 'sudo_e_emerge' 'equery' 'dev-python/setuptools_scm:2'
ERROR   update_chroot:   file update_chroot_util.sh, line 49, called: get_versions_from_equery 'equery' 'dev-python/setuptools_scm'
ERROR   update_chroot:   file update_chroot_util.sh, line 9, called: die_err_trap '"${equery_cmd}" --quiet --no-color list --format='${version} ${fullversion}' "${pkg}"' '3'
ERROR   update_chroot:
ERROR   update_chroot: Command failed:
ERROR   update_chroot:   Command '"${equery_cmd}" --quiet --no-color list --format='${version} ${fullversion}' "${pkg}"' exited with nonzero code: 3
INFO    update_chroot: No hard blockers to remove

Shut the noise up. If package is not found, then there is simply
nothing to do.
---
 build_library/update_chroot_util.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_library/update_chroot_util.sh b/build_library/update_chroot_util.sh
index e76fbeb365..3fd88e02d8 100644
--- a/build_library/update_chroot_util.sh
+++ b/build_library/update_chroot_util.sh
@@ -6,7 +6,7 @@ get_versions_from_equery() {
     local equery_cmd="${1}"
     local pkg="${2}"
 
-    "${equery_cmd}" --quiet --no-color list --format='${version} ${fullversion}' "${pkg}"
+    "${equery_cmd}" --quiet --no-color list --format='${version} ${fullversion}' "${pkg}" || :
 }
 
 filter_out_too_new() {

From 093dd589aa1c32ce380657149bdf37a4b225d4df Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <knowak@microsoft.com>
Date: Wed, 26 Apr 2023 07:48:11 +0200
Subject: [PATCH 2/2] update_chroot: Check also for a new blocker package name

The `dev-python/setuptools_scm` was renamed in first quarter of 2023
to `dev-python/setuptools-scm` (the underline was replaced with a
dash). To be safe, check for blockers with the new package name, just
in case.
---
 update_chroot | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/update_chroot b/update_chroot
index a36438ee9f..73cfa1ca8e 100755
--- a/update_chroot
+++ b/update_chroot
@@ -248,7 +248,8 @@ info "Maybe removing some hard blocks"
 # versions have !!<dev-python/setuptools_scm-2 in BDEPEND).
 remove_hard_blocks \
     sudo_e_emerge equery \
-    dev-python/setuptools_scm:2
+    dev-python/setuptools_scm:2 \
+    dev-python/setuptools-scm:2
 
 # Second pass, update everything else.
 EMERGE_FLAGS+=( --deep )