Modified the yaboot structure to better support new releases, moved release

specific files (yaboot.conf and boot.msg) to the release subdir and changed
boot scripts for potato and woody to adjust to this.

Added sarge script for booting powerpcs (still lacks some subarches).
This commit is contained in:
Santiago Garcia Mantinan 2003-10-09 21:57:34 +00:00
parent 78008efbd0
commit 00f30e2ef9
8 changed files with 204 additions and 3 deletions

View File

@ -0,0 +1,23 @@
## This yaboot.conf is for CD booting only, do not use as reference.
## Debian GNU/Linux PowerPC (CODENAME)
init-message="Debian GNU/Linux PowerPC (CODENAME)"
# It is important not to have a comma after cd:
device=cd:
timeout=100
# potato needs \\ kludge because potato's yaboot is anchient broken crap
image=\\install\\powermac\\vmlinux
label=debian
initrd=\\install\\powermac\\root.bin
initrd-size=8192
read-only
# some machines have wonky framebuffer support
image=\\install\\powermac\\vmlinux
label=debian-novideo
initrd=\\install\\powermac\\root.bin
initrd-size=8192
append="video=ofonly"
read-only

View File

@ -0,0 +1,11 @@
Welcome to Debian GNU/Linux PowerPC (CODENAME)
Additionally to the default 'install' option,
there is 'install-safe' which you should try if
the system fails to boot at all (the typical
symptom is a white screen which doesn't go away).
************************************
If in doubt, just choose 'install', and if that doesn't work, try
'install-safe'.
************************************

View File

@ -0,0 +1,25 @@
## This yaboot.conf is for CD booting only, do not use as reference.
## Debian GNU/Linux PowerPC (CODENAME)
# It is important not to have a comma after cd:
device=cd:
default=install
timeout=100
# FIXME: will this be the correct path?
message=/install/powermac/boot.msg
image=/install/powermac/vmlinux
label=install
initrd=/install/powermac/root.bin
append="init=/linuxrc"
initrd-size=8192
read-only
# some machines have wonky framebuffer support
image=/install/powermac/vmlinux
label=install-safe
initrd=/install/powermac/root.bin
initrd-size=8192
append="video=ofonly init=/linuxrc"
read-only

View File

@ -0,0 +1,20 @@
Welcome to Debian GNU/Linux PowerPC (CODENAME)
You have the choice of installing your system using one of two
different versions, 'install' or 'install24'.
The 'install' option is the default; it uses version 2.2 of the Linux
kernel and is proven to be stable on most hardware. The 'install24'
option is based on the 2.4 Linux kernel, and is a bit more
cutting-edge, but it has better support for newer hardware. If you
have a Power Macintosh computer manufactured in late 2000 or later,
definitely choose 'install24'.
Additionally, there are 'install-safe' and 'install24-safe' options
which you should try if the system fails to boot at all (the typical
symptom is a white screen which doesn't go away).
************************************
If in doubt, just choose 'install', and if that doesn't work, try
'install24', 'install-safe', and 'install24-safe' in that order.
************************************

View File

@ -0,0 +1,38 @@
## This yaboot.conf is for CD booting only, do not use as reference.
## Debian GNU/Linux PowerPC (CODENAME)
# It is important not to have a comma after cd:
device=cd:
default=install
timeout=100
# FIXME: will this be the correct path?
message=/install/powermac/boot.msg
image=/install/powermac/vmlinux
label=install
initrd=/install/powermac/root.bin
initrd-size=8192
read-only
image=/install/powermac/vmlinux2.4
label=install24
initrd=/install/powermac/root.bin
initrd-size=8192
append="disksize=2.88"
read-only
# some machines have wonky framebuffer support
image=/install/powermac/vmlinux
label=install-safe
initrd=/install/powermac/root.bin
initrd-size=8192
append="video=ofonly"
read-only
image=/install/powermac/vmlinux2.4
label=install24-safe
initrd=/install/powermac/root.bin
initrd-size=8192
append="disksize=2.88 video=ofonly"
read-only

View File

@ -113,7 +113,7 @@ cp -f $DISKSROOT/powermac/bootvars* powermac/
# New-world bootability
# This works in a subdirectory via an ugly hack; fix yaboot.
cat $BASEDIR/data/yaboot/potato-yaboot.conf \
cat $BASEDIR/data/potato/yaboot/yaboot.conf \
| sed "s/CODENAME/${CODENAME}/g" > powermac/yaboot.conf
cp -f $BASEDIR/data/yaboot/ofboot.b powermac/

84
tools/boot/sarge/boot-powerpc Executable file
View File

@ -0,0 +1,84 @@
#!/bin/bash
#
# Do install stuff for i386, including making bootable CDs
# Works with debian-installer
#
# $1 is the CD number
# $2 is the temporary CD build dir
. $BASEDIR/tools/boot/$CODENAME/common.sh
set -e
N=$1
CDDIR=$2
INSTALLDIR=$CDDIR/install
WWW_HOME="http://people.debian.org/~tsauter/"
cd $CDDIR/..
# Only disk 1* bootable
if [ $N != 1 -a $N != 1_NONUS ]; then
# we don't need HFS cruft on anything but CD 1
:> $N.mkisofs_opts
exit 0
fi
install_languages $CDDIR
echo -n "--netatalk -hfs -probe -map $BASEDIR/data/hfs.map" \
> $N.mkisofs_opts
# We are still missing this for prep
#echo -n " -prep-boot install/prep/boot.bin" >> $N.mkisofs_opts
# For newworld Mac booting - Note, no spaces in volid!
echo -n " -part -no-desktop -hfs-bless CD$N/install/powermac -hfs-volid Debian/PowerPC_${CODENAME}" \
>> $N.mkisofs_opts
cd $INSTALLDIR
# create directories for different sub-archs
mkdir {apus,chrp,powermac,prep}
# Extract yaboot from the archive
if [ -z "$YABOOT_DEBUG" ]; then
YADEB="$($BASEDIR/tools/apt-selection cache show yaboot | \
grep ^Filename | awk '{print $2}')"
(ar p "${MIRROR}/${YADEB}" data.tar.gz | \
tar zxf - -C powermac ./usr/lib/yaboot/yaboot)
mv powermac/usr/lib/yaboot/yaboot powermac/yaboot
rm -rf powermac/usr
else
cp -f $YABOOT_DEBUG powermac/yaboot
fi
#
# generate/download images for "powermac"
# (missing: bootvars1.3b.sit.hqx, BootX_1.2.2.sit, boot-floppy-hfs.img)
cd $INSTALLDIR/powermac
cat $BASEDIR/data/sarge/yaboot/boot.msg \
| sed "s/CODENAME/${CODENAME}/g" > boot.msg
cat $BASEDIR/data/sarge/yaboot/yaboot.conf \
| sed "s/CODENAME/${CODENAME}/g" > yaboot.conf
cp $BASEDIR/data/yaboot/ofboot.b ofboot.b
wget -O vmlinux $WWW_HOME/d-i/images-powerpc/daily/vmlinux
wget -O root.bin $WWW_HOME/d-i/images-powerpc/daily/cdrom-initrd.gz
#
# generate/download images for "apus"
# (missing: linux.bin)
cd $INSTALLDIR/apus
cp -lf ../powermac/root.bin .
#
# generate/download images for "chrp"
# (missing: linux.bin)
cd $INSTALLDIR/chrp
cp -lf ../powermac/root.bin .
#
# generate/download images for "prep"
# (missing: linux.bin, boot.bin)
cd $INSTALLDIR/prep
cp -lf ../powermac/root.bin .
exit 0

View File

@ -118,7 +118,7 @@ cp -f $DISKSROOT/powermac/bootvars* powermac/
# New-world bootability
# This works in a subdirectory via an ugly hack; fix yaboot.
cat $BASEDIR/data/yaboot/yaboot.conf \
cat $BASEDIR/data/woody/yaboot/yaboot.conf \
| sed "s/CODENAME/${CODENAME}/g" > powermac/yaboot.conf
cp -f $BASEDIR/data/yaboot/ofboot.b powermac/
@ -133,7 +133,7 @@ if [ -z "$YABOOT_DEBUG" ]; then
else
cp -f $YABOOT_DEBUG powermac/yaboot
fi
cp -f $BASEDIR/data/yaboot/boot.msg powermac/
cp -f $BASEDIR/data/woody/yaboot/boot.msg powermac/
#--------------- PReP - Stuff -------------------------------
echo Installing PReP files