From: Paymon MARANDI <Paymon MARANDI darwinskernel@gmail.com>
Date: Thu, 22 Jun 2023 10:57:45 +0000 (-0400)
Subject: gentoo: drop init/kernel
X-Git-Tag: v15~103^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a03e242db5df38be0cce414082af4ace3048a52;p=thirdparty%2Fmkosi.git

gentoo: drop init/kernel

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 d94fbd0d7..e204ac2ed 100644
--- a/.github/mkosi.conf.d/20-gentoo.conf
+++ b/.github/mkosi.conf.d/20-gentoo.conf
@@ -4,3 +4,7 @@ Distribution=gentoo
 [Distribution]
 Repositories=https://raw.githubusercontent.com/257/binpkgs/master
 
+[Content]
+Packages=sys-kernel/gentoo-kernel-bin
+         systemd
+
diff --git a/mkosi/distributions/gentoo.py b/mkosi/distributions/gentoo.py
index 690010e9e..e26f887e1 100644
--- a/mkosi/distributions/gentoo.py
+++ b/mkosi/distributions/gentoo.py
@@ -8,7 +8,6 @@ from pathlib import Path
 from textwrap import dedent
 
 from mkosi.architecture import Architecture
-from mkosi.config import ConfigFeature
 from mkosi.distributions import DistributionInstaller
 from mkosi.install import copy_path
 from mkosi.log import ARG_DEBUG, complete_step, die, log_step
@@ -211,27 +210,12 @@ class GentooInstaller(DistributionInstaller):
             "--root-deps=rdeps",
             "--with-bdeps=n",
         ]
-        with complete_step("Merging stage2"):
+        with complete_step("Layingout basic filesystem"):
             invoke_emerge(state, sysroot=cls.stage3_cache,
-                          options=opts+["--emptytree", "--nodeps"],
+                          options=opts+["--emptytree"],
                           packages=["sys-apps/baselayout"],
                           env={**emerge_vars, 'USE': 'build'})
 
-        opts += ["--noreplace"]
-
-        with complete_step("Merging bare minimal atoms"):
-            invoke_emerge(state, sysroot=cls.stage3_cache,
-                          options=opts+["--exclude", "sys-devel/*"],
-                          packages=["sys-apps/systemd"], env=emerge_vars)
-
-        if state.config.make_initrd:
-            return
-
-        if (state.config.bootable == ConfigFeature.enabled and not
-                state.staging.joinpath(state.config.output_split_uki).exists()):
-            invoke_emerge(state, sysroot=cls.stage3_cache, options=opts,
-                          packages=["sys-kernel/gentoo-kernel-bin"])
-
     @classmethod
     def install_packages(cls, state: MkosiState, packages: Sequence[str]) -> None:
         invoke_emerge(state, options=["--noreplace"], sysroot=cls.stage3_cache,