From: Paymon MARANDI <Paymon MARANDI darwinskernel@gmail.com>
Date: Tue, 20 Jun 2023 14:55:41 +0000 (-0400)
Subject: gentoo: let portage handle thread_count
X-Git-Tag: v15~103^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fcff0cabc0e7e214fc202778c3ada537ea7e7fb;p=thirdparty%2Fmkosi.git

gentoo: let portage handle thread_count

Signed-off-by: Paymon MARANDI <darwinskernel@gmail.com>
---

diff --git a/mkosi/distributions/gentoo.py b/mkosi/distributions/gentoo.py
index 41ce6b86c..133924d51 100644
--- a/mkosi/distributions/gentoo.py
+++ b/mkosi/distributions/gentoo.py
@@ -1,6 +1,5 @@
 # SPDX-License-Identifier: LGPL-2.1+
 
-import os
 import re
 import urllib.parse
 import urllib.request
@@ -26,7 +25,6 @@ def invoke_emerge(
     opts: Sequence[str] = (),
     env: dict[str, str] = {},
 ) -> None:
-    thread_counts = (os.cpu_count() or 1) * 2  # * 2 for hyperthreading
     # This is the mount-point inside our sysroot where we mount root
     target_root_mntp = "/tmp/mkosi-root"
     bwrap: list[PathString] = ["--bind", state.root, target_root_mntp]
@@ -38,8 +36,8 @@ def invoke_emerge(
         "--buildpkg=y",
         "--usepkg=y",
         "--keep-going=y",
-        f"--jobs={thread_counts}",
-        f"--load-average={thread_counts+1}",
+        "--jobs",
+        "--load-average",
         "--nospinner",
         *([f"--root={root}"] if root else []),
     ]