commit:     233c2db1fcd3f8907dbc83e96dce96c859ab4183
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 19 01:56:34 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Jul 19 03:03:00 2021 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=233c2db1

releases/specs/ppc/ppc64le/installcd: tune stage2 file

use full templated path to Kconfigs.
also add extra fs to installcds.
consolidate genkernel args.
fix typo.

Bug: https://bugs.gentoo.org/783945
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec 
b/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec
index de3dbdfe..20107e0f 100644
--- a/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec
+++ b/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec
@@ -10,7 +10,7 @@ portage_confdir: @REPO_DIR@/releases/portage/isos
 
 livecd/bootargs: dokeymap
 livecd/fstype: squashfs 
-livecd/gk_mainargs: --makeopts=-j12
+livecd/gk_mainargs: --makeopts=-j12 --all-ramdisk-modules --firmware
 livecd/iso: install-ppc64le-minimal-@[email protected]
 livecd/type: gentoo-release-minimal
 livecd/volid: Gentoo ppc64le @TIMESTAMP@
@@ -18,19 +18,19 @@ livecd/volid: Gentoo ppc64le @TIMESTAMP@
 boot/kernel: 4K_PAGESZ 64K_PAGESZ
 
 # OpenPower hardware primary, but kernel also supports pseries and qemu.
-# We neet to ship both 4K and 64K page kernels, as some filesystems
+# 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: 
../../../kconfig/powerpc/installcd-ppc64le-4K-5.10.config
+boot/kernel/4K_PAGESZ/config: 
@REPO_DIR@/releases/kconfig/powerpc/installcd-ppc64le-4K-5.10.config
 boot/kernel/4K_PAGESZ/console: hvc0 tty0
 boot/kernel/4K_PAGESZ/extraversion: 4K_PAGESZ
-boot/kernel/4K_PAGESZ/gk_kernargs: --all-ramdisk-modules --firmware
+boot/kernel/4K_PAGESZ/packages: zfs zfs-kmod
 
 boot/kernel/64K_PAGESZ/sources: sys-kernel/gentoo-sources
-boot/kernel/64K_PAGESZ/config: 
../../../kconfig/powerpc/installcd-ppc64le-64K-5.10.config
+boot/kernel/64K_PAGESZ/config: 
@REPO_DIR@/releases/kconfig/powerpc/installcd-ppc64le-64K-5.10.config
 boot/kernel/64K_PAGESZ/console: hvc0 tty0
 boot/kernel/64K_PAGESZ/extraversion: 64K_PAGESZ
-boot/kernel/64K_PAGESZ/gk_kernargs: --all-ramdisk-modules --firmware
+boot/kernel/64K_PAGESZ/packages: zfs zfs-kmod
 
 livecd/unmerge:
        app-admin/eselect

Reply via email to