From 1084f961fda1c76a09578367badc30b84db3fc30 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Tue, 16 Feb 2021 08:31:09 +0100
Subject: [PATCH 1/2] build_*_aci: Add missing jobs parameter

They end up using emerge_to_image which needs uses the `$FLAGS_jobs`
parameter. Seems like new portage does not like getting the parameter
like `--jobs=` (with an empty value).
---
 build_docker_aci | 2 ++
 build_oem_aci    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/build_docker_aci b/build_docker_aci
index cdd12dd61a..2916d4d3f6 100755
--- a/build_docker_aci
+++ b/build_docker_aci
@@ -54,6 +54,8 @@ DEFINE_string version "" \
   "Sets the docker version to build."
 DEFINE_integer aci_version "" \
   "Sets the aci version tag identifier."
+DEFINE_integer jobs "${NUM_JOBS}" \
+  "How many packages to build in parallel at maximum."
 
 # Parse command line.
 FLAGS "$@" || exit 1
diff --git a/build_oem_aci b/build_oem_aci
index d2fbe19a46..6e4858b680 100755
--- a/build_oem_aci
+++ b/build_oem_aci
@@ -46,6 +46,8 @@ DEFINE_string output_root "${DEFAULT_BUILD_ROOT}/images" \
   "Directory in which to place image result directories (named by version)"
 DEFINE_string version "" \
   "Overrides version number in name to this version."
+DEFINE_integer jobs "${NUM_JOBS}" \
+  "How many packages to build in parallel at maximum."
 
 # Parse command line.
 FLAGS "$@" || exit 1

From 9cbf3049ea885a8612ae3ed772b2615c7f180189 Mon Sep 17 00:00:00 2001
From: Krzesimir Nowak <krzesimir@kinvolk.io>
Date: Tue, 16 Feb 2021 08:36:57 +0100
Subject: [PATCH 2/2] vm_image-util: Forward jobs parameter to build_oem_aci

---
 build_library/vm_image_util.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index 67c9b785e3..acc884de60 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -522,6 +522,7 @@ install_oem_aci() {
     "${SCRIPT_ROOT}/build_oem_aci" \
         --board="${BOARD}" \
         --build_dir="${aci_dir}" \
+        --jobs="${FLAGS_jobs}" \
         "${binpkgflags[@]}" \
         "${oem_aci}"