commit: c5d1e5094e8aec278226dd1d2fa5a1245248f96e Author: Ian Jordan <immoloism <AT> gmail <DOT> com> AuthorDate: Thu Feb 27 19:25:50 2025 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Sun Mar 9 17:27:11 2025 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c5d1e509
PPC64LE dist-kernel support Migration from genkernel to dist kernel which also supports POWER7 CPUs as well as 8. In testing filesystems created with either 4k or 64k threads were able to be opened with this kernel, meaning we no longer need to include both. Thanks to Awilfox and Maukkis for testing and insights. Signed-off-by: Ian Jordan <immoloism <AT> gmail.com> Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> .../kconfig/powerpc/dist-ppc64le-livecd.config | 10 ++++++++++ releases/specs/ppc/ppc64le/installcd-stage1.spec | 1 + .../ppc/ppc64le/installcd-stage2-minimal.spec | 23 ++++++++-------------- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/releases/kconfig/powerpc/dist-ppc64le-livecd.config b/releases/kconfig/powerpc/dist-ppc64le-livecd.config new file mode 100644 index 00000000..31dd3777 --- /dev/null +++ b/releases/kconfig/powerpc/dist-ppc64le-livecd.config @@ -0,0 +1,10 @@ +# Kernel config for PPC64LE Livecds + +# Ian Jordan <[email protected]> (2025-02-27) +# Change CPU baseline support to POWER7 to increase the number of systems Gentoo +# supports at install time. +CONFIG_POWER7_CPU=Y + +# Ian Jordan <[email protected]> (2024-10-28) +# Remove localversion being set on the LiveCDs so localmodconfig doesn't double load. +CONFIG_LOCALVERSION="" diff --git a/releases/specs/ppc/ppc64le/installcd-stage1.spec b/releases/specs/ppc/ppc64le/installcd-stage1.spec index 22f5decf..fe28f3c4 100644 --- a/releases/specs/ppc/ppc64le/installcd-stage1.spec +++ b/releases/specs/ppc/ppc64le/installcd-stage1.spec @@ -31,6 +31,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/ppc/ppc64le/installcd-stage2-minimal.spec b/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec index 098401bc..b153e695 100644 --- a/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec +++ b/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec @@ -9,25 +9,16 @@ portage_confdir: @REPO_DIR@/releases/portage/isos livecd/bootargs: dokeymap livecd/fstype: squashfs -livecd/gk_mainargs: --makeopts=-j12 --all-ramdisk-modules livecd/iso: install-ppc64le-minimal-@[email protected] livecd/type: gentoo-release-minimal -livecd/volid: Gentoo ppc64le @TIMESTAMP@ +livecd/volid: Gentoo-ppc64le-@TIMESTAMP@ -boot/kernel: 4K_PAGESZ 64K_PAGESZ +boot/kernel: gentoo -# OpenPower hardware primary, but kernel also supports pseries and qemu. -# We need to ship both 4K and 64K page kernels, as some filesystems -# can't be mounted on 4K if created on 64K kernels (btrfs is known to do that and some others) -boot/kernel/4K_PAGESZ/sources: sys-kernel/gentoo-sources -boot/kernel/4K_PAGESZ/config: @REPO_DIR@/releases/kconfig/powerpc/installcd-ppc64le-4K-5.10.config -boot/kernel/4K_PAGESZ/extraversion: 4K_PAGESZ -boot/kernel/4K_PAGESZ/packages: --usepkg n zfs zfs-kmod - -boot/kernel/64K_PAGESZ/sources: sys-kernel/gentoo-sources -boot/kernel/64K_PAGESZ/config: @REPO_DIR@/releases/kconfig/powerpc/installcd-ppc64le-64K-5.10.config -boot/kernel/64K_PAGESZ/extraversion: 64K_PAGESZ -boot/kernel/64K_PAGESZ/packages: --usepkg n zfs zfs-kmod +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/powerpc/dist-ppc64le-livecd.config +boot/kernel/gentoo/packages: --usepkg n zfs zfs-kmod livecd/unmerge: app-admin/eselect @@ -36,6 +27,7 @@ livecd/unmerge: app-admin/perl-cleaner app-admin/python-updater app-arch/cpio + app-portage/gentoolkit dev-build/libtool dev-libs/gmp dev-libs/libxml2 @@ -79,6 +71,7 @@ livecd/empty: /etc/cron.monthly /etc/cron.weekly /etc/logrotate.d + /etc/kernel/config.d /etc/modules.autoload.d /etc/rsync /etc/runlevels/single
