From: Paymon MARANDI <Paymon MARANDI darwinskernel@gmail.com>
Date: Wed, 21 Jun 2023 15:23:13 +0000 (-0400)
Subject: gentoo: don't bother with @system set and bash
X-Git-Tag: v15~103^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb1d8f3ff5bddb5ef6d17b31fc024fbd4863f6bf;p=thirdparty%2Fmkosi.git

gentoo: don't bother with @system set and bash

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

diff --git a/mkosi/distributions/gentoo.py b/mkosi/distributions/gentoo.py
index 0e5f45400..b26336a8f 100644
--- a/mkosi/distributions/gentoo.py
+++ b/mkosi/distributions/gentoo.py
@@ -223,12 +223,12 @@ class GentooInstaller(DistributionInstaller):
                               bwrap_params=bwrap_params, network=True)
 
         opts = [
-            "--with-bdeps=n",
             "--complete-graph-if-new-use=y",
             "--verbose-conflicts",
             "--changed-use",
             "--newuse",
             "--root-deps=rdeps",
+            "--with-bdeps=n",
         ]
         with complete_step("Merging stage2"):
             invoke_emerge(state, sysroot=cls.stage3_cache,
@@ -241,7 +241,7 @@ class GentooInstaller(DistributionInstaller):
         with complete_step("Merging bare minimal atoms"):
             invoke_emerge(state, sysroot=cls.stage3_cache,
                           opts=opts+["--exclude", "sys-devel/*"],
-                          pkgs=["app-shells/bash", "sys-apps/systemd"],
+                          pkgs=["sys-apps/systemd"],
                           env=emerge_vars)
 
         if state.config.make_initrd:
@@ -249,8 +249,6 @@ class GentooInstaller(DistributionInstaller):
 
         invoke_emerge(state, sysroot=cls.stage3_cache, opts=opts,
                       pkgs=["sys-kernel/gentoo-kernel-bin"])
-        invoke_emerge(state, sysroot=cls.stage3_cache, opts=opts,
-                      pkgs=["@system"])
 
     @classmethod
     def install_packages(cls, state: MkosiState, packages: Sequence[str]) -> None: