summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-07-06 18:07:05 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-08-01 03:13:49 -0500
commitbb58b17d9c77b566045fb3d422fc934d2f3423e9 (patch)
tree4c8ec4630c3b39d2f18441a2e474b2aa7053509e
parent8d6f2a5901fc5660e71f6e281159b1b439103f5e (diff)
downloadimage-bb58b17d9c77b566045fb3d422fc934d2f3423e9.tar.gz
image-bb58b17d9c77b566045fb3d422fc934d2f3423e9.tar.bz2
image-bb58b17d9c77b566045fb3d422fc934d2f3423e9.tar.xz
image-bb58b17d9c77b566045fb3d422fc934d2f3423e9.zip
Support POWER8 kernel on PPC64 media
-rw-r--r--iso-params-ppc2
-rw-r--r--iso-params-ppc642
-rwxr-xr-xpost-ppc64.sh2
-rw-r--r--ppc/early.cfg2
-rw-r--r--ppc/grub.cfg4
-rw-r--r--ppc/grub.cfg6413
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
}