summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2018-04-26 03:53:54 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2018-04-26 03:53:54 -0500
commit9d27f752041dfdaa7eb367a2bb0ce16c83ba1411 (patch)
tree2fe96c03c56ed45ff62d17fba46dd46d4e418db3
parent7082b653bca46ab238bc52ca55cd7651c2201714 (diff)
downloadimage-9d27f752041dfdaa7eb367a2bb0ce16c83ba1411.tar.gz
image-9d27f752041dfdaa7eb367a2bb0ce16c83ba1411.tar.bz2
image-9d27f752041dfdaa7eb367a2bb0ce16c83ba1411.tar.xz
image-9d27f752041dfdaa7eb367a2bb0ce16c83ba1411.zip
Update PPC64 stuff for alpha6
-rwxr-xr-xcdinit-ppc64bin75368 -> 75352 bytes
-rwxr-xr-xpost-ppc64.sh14
-rw-r--r--ppc/grub.cfg644
3 files changed, 9 insertions, 9 deletions
diff --git a/cdinit-ppc64 b/cdinit-ppc64
index 38fe467..bdd354d 100755
--- a/cdinit-ppc64
+++ b/cdinit-ppc64
Binary files differ
diff --git a/post-ppc64.sh b/post-ppc64.sh
index eb31981..4ee8183 100755
--- a/post-ppc64.sh
+++ b/post-ppc64.sh
@@ -1,13 +1,13 @@
mkdir -p cdroot-ppc64/boot
-if ! type grub-mkimage>/dev/null; then
- echo "GRUB image cannot be created. Using stale copy."
- curl "https://distfiles.adelielinux.org/adelie/1.0-alpha/ppc/grubcore.img" > cdroot-ppc/boot/grubcore.img
-else
- grub-mkimage -c ppc/early.cfg -v -p boot -o cdroot-ppc64/boot/grubcore.img -O powerpc-ieee1275 boot btrfs datetime disk ext2 gfxmenu help hfs hfsplus ieee1275_fb iso9660 jfs ls luks lvm macbless macho nilfs2 ofnet part_apple part_gpt part_msdos png scsi search xfs linux reboot gfxterm gfxterm_background gfxterm_menu
-fi
+#if ! type grub-mkimage>/dev/null; then
+# echo "GRUB image cannot be created. Using stale copy."
+# curl "https://distfiles.adelielinux.org/adelie/1.0-alpha/ppc/grubcore.img" > cdroot-ppc/boot/grubcore.img
+#else
+# grub-mkimage -c ppc/early.cfg -v -p boot -o cdroot-ppc64/boot/grubcore.img -O powerpc-ieee1275 boot btrfs datetime disk ext2 gfxmenu help hfs hfsplus ieee1275_fb iso9660 jfs ls luks lvm macbless macho nilfs2 ofnet part_apple part_gpt part_msdos png scsi search xfs linux reboot gfxterm gfxterm_background gfxterm_menu
+#fi
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-ppc/boot/ofboot.b cdroot-ppc64/boot/bootinfo.txt
+cp cdroot-ppc64/boot/ofboot.b cdroot-ppc64/boot/bootinfo.txt
diff --git a/ppc/grub.cfg64 b/ppc/grub.cfg64
index cae5083..a8091ae 100644
--- a/ppc/grub.cfg64
+++ b/ppc/grub.cfg64
@@ -1,8 +1,8 @@
-menuentry "Adelie Linux 1.0-alpha3 Live (PowerPC 64-bit)" --class linux --id adelie-live-64 {
+menuentry "Adelie Linux 1.0-alpha6 Live (PowerPC 64-bit)" --class linux --id adelie-live-64 {
insmod part_apple
insmod iso9660
insmod linux
- search --label "Adelie_1.0a3" --hint cd,apple2
+ search --label "Adelie_1.0a6" --hint cd,apple2
linux /bzImage
initrd /initrd
}