From 6fe8ad89cc2b67788042ab44ed5a466278f1fa36 Mon Sep 17 00:00:00 2001
From: James Le Cuirot <jlecuirot@microsoft.com>
Date: Wed, 8 Apr 2026 11:01:28 +0100
Subject: [PATCH] build_image_util: Speed up build_image with
 FEATURES="-merge-wait"

I see a 25% improvement. `man make.conf` says that this can potentially
result in build failures, but it seems unlikely when merely installing
binary packages. I haven't had any issues after several local builds.

Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
---
 build_library/build_image_util.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build_library/build_image_util.sh b/build_library/build_image_util.sh
index e87f3d3493..4c179b3399 100755
--- a/build_library/build_image_util.sh
+++ b/build_library/build_image_util.sh
@@ -150,7 +150,7 @@ emerge_to_image() {
   fi
 
   sudo -E ROOT="${root_fs_dir}" \
-      FEATURES="-ebuild-locks" \
+      FEATURES="-ebuild-locks -merge-wait" \
       PORTAGE_CONFIGROOT="${BUILD_DIR}"/configroot \
       emerge --usepkgonly --jobs="${NUM_JOBS}" --verbose "$@"