From bb58b17d9c77b566045fb3d422fc934d2f3423e9 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Fri, 6 Jul 2018 18:07:05 -0500 Subject: Support POWER8 kernel on PPC64 media --- iso-params-ppc | 2 +- iso-params-ppc64 | 2 +- post-ppc64.sh | 2 ++ ppc/early.cfg | 2 +- ppc/grub.cfg | 4 ++-- ppc/grub.cfg64 | 13 +++++++++++-- 6 files changed, 18 insertions(+), 7 deletions(-) diff --git a/iso-params-ppc b/iso-params-ppc index 126b2c1..7f9757d 100644 --- a/iso-params-ppc +++ b/iso-params-ppc @@ -1 +1 @@ --hfs -hfs-volid Adelie_1.0a6 -part -no-desktop -map mapping-ppc -hfs-bless cdroot-ppc/boot -chrp-boot -prep-boot boot/grubcore.img +-hfs -hfs-volid Adelie_1.0b1 -part -no-desktop -map mapping-ppc -hfs-bless cdroot-ppc/boot -chrp-boot -prep-boot boot/grubcore.img diff --git a/iso-params-ppc64 b/iso-params-ppc64 index 126b2c1..7f9757d 100644 --- a/iso-params-ppc64 +++ b/iso-params-ppc64 @@ -1 +1 @@ --hfs -hfs-volid Adelie_1.0a6 -part -no-desktop -map mapping-ppc -hfs-bless cdroot-ppc/boot -chrp-boot -prep-boot boot/grubcore.img +-hfs -hfs-volid Adelie_1.0b1 -part -no-desktop -map mapping-ppc -hfs-bless cdroot-ppc/boot -chrp-boot -prep-boot boot/grubcore.img diff --git a/post-ppc64.sh b/post-ppc64.sh index 4ee8183..d36c059 100755 --- a/post-ppc64.sh +++ b/post-ppc64.sh @@ -11,3 +11,5 @@ cp AdelieTux.icns 'cdroot-ppc64/Icon ' cp ppc/grub.cfg64 cdroot-ppc64/boot/grub.cfg cp ppc/ofboot.b cdroot-ppc64/boot/ofboot.b cp cdroot-ppc64/boot/ofboot.b cdroot-ppc64/boot/bootinfo.txt + +curl https://distfiles.adelielinux.org/adelie/1.0-beta1/system/ppc64/easy-kernel-power8-4.14.48-mc8-4.14.48-r8.apk | tar -xzOf - boot/vmlinux-4.14.48-mc8-easy > cdroot-ppc64/boot/bzImage-p8 diff --git a/ppc/early.cfg b/ppc/early.cfg index db559e7..cd46b9a 100644 --- a/ppc/early.cfg +++ b/ppc/early.cfg @@ -1,2 +1,2 @@ -search.fs_label Adelie_1.0a6 root +search.fs_label Adelie_1.0b1 root set prefix=($root)/boot diff --git a/ppc/grub.cfg b/ppc/grub.cfg index 5ff328c..257efd5 100644 --- a/ppc/grub.cfg +++ b/ppc/grub.cfg @@ -1,8 +1,8 @@ -menuentry "Adelie Linux 1.0-alpha4 Live (PowerPC 32-bit)" --class linux --id adelie-live-cd { +menuentry "Adelie Linux 1.0-beta1 Live (PowerPC 32-bit)" --class linux --id adelie-live-cd { insmod part_apple insmod iso9660 insmod linux - search --label "Adelie_1.0a4" --hint cd,apple2 + search --label "Adelie_1.0b1" --hint cd,apple2 linux /bzImage initrd /initrd } diff --git a/ppc/grub.cfg64 b/ppc/grub.cfg64 index a8091ae..9a28cc8 100644 --- a/ppc/grub.cfg64 +++ b/ppc/grub.cfg64 @@ -1,12 +1,21 @@ -menuentry "Adelie Linux 1.0-alpha6 Live (PowerPC 64-bit)" --class linux --id adelie-live-64 { +menuentry "Adelie Linux 1.0-beta1 Live (PowerPC 64-bit)" --class linux --id adelie-live-64 { insmod part_apple insmod iso9660 insmod linux - search --label "Adelie_1.0a6" --hint cd,apple2 + search --label "Adelie_1.0b1" --hint cd,apple2 linux /bzImage initrd /initrd } +menuentry "Adelie Linux 1.0-beta1 Live (PowerPC 64-bit - POWER8 and newer CPUs)" --class linux --id adelie-live-p8 { + insmod part_apple + insmod iso9660 + insmod linux + search --label "Adelie_1.0b1" --hint cd,apple2 + linux /bzImage-p8 + initrd /initrd +} + menuentry "Reboot and Try Again" --class reboot --id reboot { reboot } -- cgit v1.2.3-70-g09d2