| 1 |
commit: 233c2db1fcd3f8907dbc83e96dce96c859ab4183 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 19 01:56:34 2021 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 19 03:03:00 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=233c2db1 |
| 7 |
|
| 8 |
releases/specs/ppc/ppc64le/installcd: tune stage2 file |
| 9 |
|
| 10 |
use full templated path to Kconfigs. |
| 11 |
also add extra fs to installcds. |
| 12 |
consolidate genkernel args. |
| 13 |
fix typo. |
| 14 |
|
| 15 |
Bug: https://bugs.gentoo.org/783945 |
| 16 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 17 |
|
| 18 |
releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec | 12 ++++++------ |
| 19 |
1 file changed, 6 insertions(+), 6 deletions(-) |
| 20 |
|
| 21 |
diff --git a/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec b/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec |
| 22 |
index de3dbdfe..20107e0f 100644 |
| 23 |
--- a/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec |
| 24 |
+++ b/releases/specs/ppc/ppc64le/installcd-stage2-minimal.spec |
| 25 |
@@ -10,7 +10,7 @@ portage_confdir: @REPO_DIR@/releases/portage/isos |
| 26 |
|
| 27 |
livecd/bootargs: dokeymap |
| 28 |
livecd/fstype: squashfs |
| 29 |
-livecd/gk_mainargs: --makeopts=-j12 |
| 30 |
+livecd/gk_mainargs: --makeopts=-j12 --all-ramdisk-modules --firmware |
| 31 |
livecd/iso: install-ppc64le-minimal-@TIMESTAMP@.iso |
| 32 |
livecd/type: gentoo-release-minimal |
| 33 |
livecd/volid: Gentoo ppc64le @TIMESTAMP@ |
| 34 |
@@ -18,19 +18,19 @@ livecd/volid: Gentoo ppc64le @TIMESTAMP@ |
| 35 |
boot/kernel: 4K_PAGESZ 64K_PAGESZ |
| 36 |
|
| 37 |
# OpenPower hardware primary, but kernel also supports pseries and qemu. |
| 38 |
-# We neet to ship both 4K and 64K page kernels, as some filesystems |
| 39 |
+# We need to ship both 4K and 64K page kernels, as some filesystems |
| 40 |
# can't be mounted on 4K if created on 64K kernels (btrfs is known to do that and some others) |
| 41 |
boot/kernel/4K_PAGESZ/sources: sys-kernel/gentoo-sources |
| 42 |
-boot/kernel/4K_PAGESZ/config: ../../../kconfig/powerpc/installcd-ppc64le-4K-5.10.config |
| 43 |
+boot/kernel/4K_PAGESZ/config: @REPO_DIR@/releases/kconfig/powerpc/installcd-ppc64le-4K-5.10.config |
| 44 |
boot/kernel/4K_PAGESZ/console: hvc0 tty0 |
| 45 |
boot/kernel/4K_PAGESZ/extraversion: 4K_PAGESZ |
| 46 |
-boot/kernel/4K_PAGESZ/gk_kernargs: --all-ramdisk-modules --firmware |
| 47 |
+boot/kernel/4K_PAGESZ/packages: zfs zfs-kmod |
| 48 |
|
| 49 |
boot/kernel/64K_PAGESZ/sources: sys-kernel/gentoo-sources |
| 50 |
-boot/kernel/64K_PAGESZ/config: ../../../kconfig/powerpc/installcd-ppc64le-64K-5.10.config |
| 51 |
+boot/kernel/64K_PAGESZ/config: @REPO_DIR@/releases/kconfig/powerpc/installcd-ppc64le-64K-5.10.config |
| 52 |
boot/kernel/64K_PAGESZ/console: hvc0 tty0 |
| 53 |
boot/kernel/64K_PAGESZ/extraversion: 64K_PAGESZ |
| 54 |
-boot/kernel/64K_PAGESZ/gk_kernargs: --all-ramdisk-modules --firmware |
| 55 |
+boot/kernel/64K_PAGESZ/packages: zfs zfs-kmod |
| 56 |
|
| 57 |
livecd/unmerge: |
| 58 |
app-admin/eselect |
Archives