commit:     f99802ec3264103d29c3aaf1ba9e6f503370de44
Author:     Ian Jordan <immoloism <AT> gmail <DOT> com>
AuthorDate: Mon Dec 30 10:54:56 2024 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 16:12:59 2024 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=f99802ec

arm64 installcd: Enable dist kernel

This enables the dist kernel on arm64 as default.

Genkernel is currently a fallback as an err to caution as we don't have enough 
test
with arn64 hardware at this time. I'd like to remove the fallback after 6 
months.

Signed-off-by: Ian Jordan <immoloism <AT> gmail.com>
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 releases/specs/arm64/installcd-stage1.spec         |  1 +
 releases/specs/arm64/installcd-stage2-minimal.spec | 12 ++++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/releases/specs/arm64/installcd-stage1.spec 
b/releases/specs/arm64/installcd-stage1.spec
index 262cc0bc..1ed133cf 100644
--- a/releases/specs/arm64/installcd-stage1.spec
+++ b/releases/specs/arm64/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-shells/bash-completion
        app-shells/gentoo-bashcomp

diff --git a/releases/specs/arm64/installcd-stage2-minimal.spec 
b/releases/specs/arm64/installcd-stage2-minimal.spec
index e0387aa0..16fd0711 100644
--- a/releases/specs/arm64/installcd-stage2-minimal.spec
+++ b/releases/specs/arm64/installcd-stage2-minimal.spec
@@ -12,14 +12,18 @@ livecd/fstype: squashfs
 livecd/gk_mainargs: --all-ramdisk-modules --firmware
 livecd/iso: install-arm64-minimal-@[email protected]
 livecd/type: gentoo-release-minimal
-livecd/volid: Gentoo arm64 @TIMESTAMP@
+livecd/volid: Gentoo-arm64-@TIMESTAMP@
 
-boot/kernel: gentoo
+boot/kernel: gentoo fallback
 
-boot/kernel/gentoo/sources: sys-kernel/gentoo-sources
-boot/kernel/gentoo/config: 
@REPO_DIR@/releases/kconfig/arm64/arm64-5.15.12.config
+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 -o zfs -i /lib/keymaps /lib/keymaps -I busybox
 boot/kernel/gentoo/packages: --usepkg n zfs zfs-kmod
 
+boot/kernel/fallback/sources: sys-kernel/gentoo-sources
+boot/kernel/fallback/config: 
@REPO_DIR@/releases/kconfig/arm64/arm64-5.15.12.config
+boot/kernel/fallback/packages: --usepkg n zfs zfs-kmod
+
 livecd/unmerge:
        app-admin/eselect
        app-admin/eselect-ctags

Reply via email to