From: Paymon MARANDI <Paymon MARANDI darwinskernel@gmail.com>
Date: Sat, 24 Jun 2023 16:11:06 +0000 (-0400)
Subject: gentoo: reinstate systemd flags and lost emerge_vars
X-Git-Tag: v15~103^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1570%2Fhead;p=thirdparty%2Fmkosi.git

gentoo: reinstate systemd flags and lost emerge_vars

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

diff --git a/.github/mkosi.conf.d/20-gentoo.conf b/.github/mkosi.conf.d/20-gentoo.conf
index aface14f3..de99436a9 100644
--- a/.github/mkosi.conf.d/20-gentoo.conf
+++ b/.github/mkosi.conf.d/20-gentoo.conf
@@ -7,5 +7,9 @@ Repositories=https://raw.githubusercontent.com/257/binpkgs/master
 [Content]
 Packages=sys-kernel/gentoo-kernel-bin
          sys-apps/systemd
+         # Failed to execute /usr/lib/systemd/system-environment-generators/10-gentoo-path: No such file or directory
+         # Failed to execute /usr/lib/systemd/system-generators/gentoo-local-generator: No such file or directory
          sys-apps/gentoo-systemd-integration
-
+         app-shells/bash
+         # mkosi-check-and-shutdown.sh[46]: /usr/lib/systemd/mkosi-check-and-shutdown.sh: line 5: tee: command not found
+         sys-apps/coreutils
diff --git a/mkosi/distributions/gentoo.py b/mkosi/distributions/gentoo.py
index 1ccfa3d6b..2946d1bcc 100644
--- a/mkosi/distributions/gentoo.py
+++ b/mkosi/distributions/gentoo.py
@@ -30,6 +30,7 @@ def invoke_emerge(
         cmd=[
             "emerge",
             *packages,
+            "--update",
             "--buildpkg=y",
             "--usepkg=y",
             "--keep-going=y",
@@ -38,6 +39,10 @@ def invoke_emerge(
             "--nospinner",
             "--root-deps=rdeps",
             "--with-bdeps=n",
+            "--complete-graph-if-new-use=y",
+            "--verbose-conflicts",
+            "--changed-use",
+            "--newuse",
             f"--root={Path('/tmp/mkosi-root')}",
             *(["--verbose", "--quiet=n", "--quiet-fail=n"] if ARG_DEBUG.get() else ["--quiet-build", "--quiet"]),
             *options,
@@ -167,14 +172,8 @@ class GentooInstaller(DistributionInstaller):
         run_workspace_command(stage3_cache, ["/usr/bin/emerge-webrsync"],
                               bwrap_params=bwrap_params, network=True)
 
-        opts = [
-            "--complete-graph-if-new-use=y",
-            "--verbose-conflicts",
-            "--changed-use",
-            "--newuse",
-        ]
         with complete_step("Layingout basic filesystem"):
-            invoke_emerge(state, options=opts+["--emptytree"],
+            invoke_emerge(state, options=["--emptytree"],
                           packages=["sys-apps/baselayout"],
                           env={'USE': 'build'})