Merge branch 'installkernel'

CHANGELOG.md

@@ -1,5 +1,6 @@
 ### Fix
 - Voidlinux, remove 'base-container-full' instead of 'base-voidstrap'.
+- Gentoo, use sys-kernel/installkernel, sys-kernel/installkernel-systemd was removed.
 
 ## 0.7.0, release 2023-12
 * Add support for ssd disk `/dev/nvme*` #5

lib/getch/gentoo/sources.rb

@@ -22,6 +22,7 @@ def x
         bask
         gen_cmdline
         grub_mkconfig
+        systemd_mkconfig
         use_flags
         make
       end
@@ -43,12 +44,25 @@ def gen_cmdline
         cmdline.main
       end
 
+      # https://wiki.gentoo.org/wiki/Handbook:X86/Installation/Kernel#GRUB
       def grub_mkconfig
         return if Helpers.systemd_minimal?
 
         # https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
-        use = Getch::Gentoo::Use.new('sys-kernel/installkernel-gentoo')
+        use = Getch::Gentoo::Use.new('sys-kernel/installkernel')
         use.add('grub')
+        use.add('dracut')
+      end
+
+      #  https://wiki.gentoo.org/wiki/Handbook:X86/Installation/Kernel#systemd-boot
+      def systemd_mkconfig
+        return unless Helpers.systemd_minimal?
+
+        use = Getch::Gentoo::Use.new('sys-apps/systemd')
+        use.add('boot')
+        other_use = Getch::Gentoo::Use.new('sys-kernel/installkernel')
+        other_use.add('systemd-boot')
+        other_use.add('dracut')
       end
 
       def use_flags
@@ -58,11 +72,7 @@ def use_flags
 
       # https://wiki.gentoo.org/wiki/Handbook:AMD64/Installation/Kernel#Alternative:_Using_distribution_kernels
       def make
-        if Helpers.systemd_minimal?
-          Install.new('sys-kernel/installkernel-systemd')
-        else
-          Install.new('sys-kernel/installkernel-gentoo')
-        end
+        Install.new('sys-kernel/installkernel')
 
         # Install.new 'sys-kernel/gentoo-kernel'
         Install.new 'sys-kernel/gentoo-kernel-bin'

lib/getch/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Getch
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end