[gentoo-commits] proj/releng:master commit in: releases/specs/amd64/

[Ben Kohler]

commit:     b8b7b26bbdcc5802a15de2d1f308cd51e3768af1
Author:     Ian Jordan <immoloism <AT> gmail <DOT> com>
AuthorDate: Tue Jul 30 19:05:39 2024 +0000
Commit:     Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Aug 22 18:36:09 2024 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=b8b7b26b

amd64 installcd-min.spec: Convert to dist-kernel

Full dist kernel support for minimal isos matching what we had with genkernel.

Signed-off-by: Ian Jordan <immoloism <AT> gmail.com>
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>

 releases/specs/amd64/installcd-stage1.spec         |  1 +
 releases/specs/amd64/installcd-stage2-minimal.spec | 15 +++++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/releases/specs/amd64/installcd-stage1.spec 
b/releases/specs/amd64/installcd-stage1.spec
index f5e625e8..ee0df51a 100644
--- a/releases/specs/amd64/installcd-stage1.spec
+++ b/releases/specs/amd64/installcd-stage1.spec
@@ -32,6 +32,7 @@ livecd/packages:
        app-misc/screen
        app-misc/tmux
        app-portage/cpuid2cpuflags
+       app-portage/gentoolkit
        app-portage/mirrorselect
        app-text/wgetpaste
        dev-debug/strace

diff --git a/releases/specs/amd64/installcd-stage2-minimal.spec 
b/releases/specs/amd64/installcd-stage2-minimal.spec
index 8412df59..13404d3c 100644
--- a/releases/specs/amd64/installcd-stage2-minimal.spec
+++ b/releases/specs/amd64/installcd-stage2-minimal.spec
@@ -11,14 +11,14 @@ livecd/bootargs: dokeymap
 livecd/fstype: squashfs
 livecd/iso: install-amd64-minimal-@TIMESTAMP@.iso
 livecd/type: gentoo-release-minimal
-livecd/volid: Gentoo amd64 @TIMESTAMP@
+livecd/volid: Gentoo-amd64-@TIMESTAMP@
 
 boot/kernel: gentoo
 
-boot/kernel/gentoo/sources: gentoo-sources
-boot/kernel/gentoo/config: 
@REPO_DIR@/releases/kconfig/amd64/amd64-6.6.30.config
-
-boot/kernel/gentoo/packages: --usepkg n broadcom-sta
+boot/kernel/gentoo/distkernel: yes
+boot/kernel/gentoo/dracut_args: --xz --no-hostonly -a dmsquash-live -a mdraid 
-o btrfs -o crypt -o i18n -o usrmount -o lunmask -o qemu -o qemu-net -o nvdimm 
-o multipath -i /lib/keymaps /lib/keymaps -I busybox
+boot/kernel/gentoo/config: 
@REPO_DIR@/releases/kconfig/amd64/dist-amd64-livecd.config
+boot/kernel/gentoo/packages: net-wireless/broadcom-sta
 
 livecd/unmerge:
        app-admin/eselect
@@ -26,6 +26,7 @@ livecd/unmerge:
        app-admin/eselect-vi
        app-admin/perl-cleaner
        app-admin/python-updater
+       app-portage/gentoolkit
        app-arch/cpio
        dev-build/libtool
        dev-lang/rust-bin
@@ -63,7 +64,8 @@ livecd/unmerge:
        sys-devel/patch
        sys-libs/db
        sys-libs/gdbm
-       sys-kernel/genkernel
+       sys-kernel/dracut
+       sys-kernel/gentoo-kernel
        sys-kernel/linux-headers
 
 livecd/empty:
@@ -72,6 +74,7 @@ livecd/empty:
        /etc/cron.hourly
        /etc/cron.monthly
        /etc/cron.weekly
+       /etc/kernel/config.d
        /etc/logrotate.d
        /etc/modules.autoload.d
        /etc/rsync