* Splitted the boot disks scripts for slink & potato.

* Corrected the Makefile accordingly.
* Updated the tasks/Debian_potato to use the task-* packages.
This commit is contained in:
Raphaël Hertzog 1999-11-11 20:22:24 +00:00
parent 807aa1637f
commit 479e95a41e
13 changed files with 559 additions and 6 deletions

View File

@ -307,9 +307,9 @@ $(BDIR)/bootable-stamp:
@for file in $(BDIR)/*.packages; do \
dir=$${file%%.packages}; \
n=$${dir##$(BDIR)/}; \
if [ -x $(BASEDIR)/tools/boot/boot-$(ARCH) ]; then \
if [ -x $(BASEDIR)/tools/boot/$(CODENAME)/boot-$(ARCH) ]; then \
cd $(BDIR); \
$(BASEDIR)/tools/boot/boot-$(ARCH) $$n $$dir; \
$(BASEDIR)/tools/boot/$(CODENAME)/boot-$(ARCH) $$n $$dir; \
else \
echo "No script to make CDs bootable for $(ARCH) ..."; \
exit 1; \

10
debian/changelog vendored
View File

@ -1,3 +1,13 @@
debian-cd (2.1.91) unstable; urgency=low
* Splitted the boot scripts for slink & potato. Updated the Makefile
to handle this.
* Updated the tasks/Debian_potato to use the new task-* packages.
* New boot-i386 which does use resc2880.bin (the tecra image has
been removed since it does no more exist in the latest boot-floppies).
-- Raphael Hertzog <hertzog@debian.org> Thu, 11 Nov 1999 20:50:26 +0100
debian-cd (2.1.90-1) unstable; urgency=low
* Moved to contrib because of the unzip and lha dependencies.

View File

@ -4,10 +4,40 @@
*
*/
/* Be sure to have all packages for the standard tasks & profiles on
* the first CD */
#include <potato/@ARCH@/Task_ALL>
#include <potato/@ARCH@/Profile_ALL>
/* The potato CD set does now use empty package called task-*
to select the packages in the initial installation */
task-dialup
task-dialup-isdn
task-newbie-help
task-gnome-desktop
task-gnome-games
task-gnome-net
task-gnome-apps
task-sgml
task-tex
task-samba
task-games
task-laptop
task-devel-common
task-c-dev
task-c++-dev
task-debug
task-sgml-dev
task-tcltk
task-fortran
task-objc-dev
/* Well I don't know if task for specific countries should be included
on the first CD ...
I'll leave it there for now ..
*/
task-german
task-chinese-s
task-chinese-t
task-japanese
task-polish
/* List of packages that may still fit on the first CD */

92
tools/boot/potato/boot-i386 Executable file
View File

@ -0,0 +1,92 @@
#!/bin/bash
#
# boot-i386 v 1.13 (c) Steve McIntyre <stevem@chiark.greenend.org.uk>
# Released under GPL 31 Mar 1999
# 06-10-99 jjw Added $CODENAME and $CODENAME_STATUS support
#
# Heavily hacked by Raphaël Hertzog <hertzog@debian.org> for
# YACS (the new debian-cd in potato)
#
# Do install stuff for i386, including making bootable CDs
#
# $1 is the CD number
# $2 is the temporary CD build dir
N=$1
CDDIR=$2
BOOTDIR=
cd $CDDIR/..
# There's no more tecra disk in Debian potato
# Tecra image for disk 2
#if [ $N == 2 ]; then
# :> 2.mkisofs_opts
# if [ -e 1/dists/$CODENAME/main/disks-$ARCH/current/resc1440tecra.bin ]
# then
# mkdir -p boot2/boot
# cp 1/dists/$CODENAME/main/disks-$ARCH/current/resc1440tecra.bin \
# boot2/boot
# echo -n "-J -b boot/resc1440tecra.bin -c boot/boot.catalog boot2" \
# > 2.mkisofs_opts
# fi
# exit 0;
#fi
# Disks != 1 and not 2
if [ $N != 1 ]; then
echo -n "-J" > $N.mkisofs_opts
exit 0;
fi
# Now we do disk 1 ...
echo -n "-J -b boot/resc2880.bin -c boot/boot.catalog boot1" > 1.mkisofs_opts
(cd $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/ ; \
cp resc*.bin linux root.bin $CDDIR/install )
mkdir -p boot1/boot
cp $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/resc2880.bin boot1/boot
#Extracting tools for disc 1
mkdir -p $CDDIR/tools/fips20
(cd $CDDIR/tools/fips20; \
unzip -Lq $MIRROR/tools/fips20.zip >/dev/null; \
rm restorrb source -rf)
(cd $CDDIR/tools; \
unzip -Lq $MIRROR/tools/lodlin16.zip >/dev/null; \
rm lodlin16/src lodlin16/initrd loadlin16/debian -rf )
mkdir $CDDIR/tools/rawrite1
(cd $CDDIR/tools/rawrite1; \
unzip -Lq $MIRROR/tools/rawrite1.zip >/dev/null)
mkdir $CDDIR/tools/rawrite2
(cd $CDDIR/tools/rawrite2; \
unzip -Lq $MIRROR/tools/rawrite2.zip >/dev/null; \
rm rawrite2.c )
(echo "Tools for DOS :" ; \
echo "fips20/ non-destructively shorten a FAT partition" ; \
echo "lodlin16/ load Linux kernel from DOS" ;\
echo "rawrite1/ rawrite 1.3 : create disks from disk images (*.bin)"; \
echo "rawrite2/ rawrite 2.0 : create disks from disk images (*.bin)"; \
echo " rawrite 2.0 is much faster, but it locks up on some machines";\
) |todos > $CDDIR/tools/README.tools
cp $CDDIR/tools/lodlin16/*.exe $CDDIR/install
cp $CDDIR/tools/rawrite1/rawrite3.com $CDDIR/install/rw1_3.com
cp $CDDIR/tools/rawrite2/rawrite2.exe $CDDIR/install/rw2_0.exe
cp $CDDIR/tools/fips*/*.exe $CDDIR/install
(echo "@ echo off" ; \
echo "rem Flush any write-cached disk blocks before we leave DOS. " ; \
echo "smartdrv /c" ; \
echo "loadlin.exe linux root=/dev/ram ro initrd=root.bin" ; \
) |todos > $CDDIR/install/boot.bat

70
tools/boot/slink/boot-alpha Executable file
View File

@ -0,0 +1,70 @@
#!/bin/bash
#
# boot-alpha v 1.13 (c) Steve McIntyre <stevem@chiark.greenend.org.uk>
# and Loic Prylli <Loic.Prylli@ens-lyon.fr>
# Released under GPL 31 Mar 1999
# See the file COPYING for license details
# Released as part of the slink_cd package, not much use standalone
#
# Do install stuff for alpha, including making bootable CDs
#
N=$1
CDDIR=$2
cd $CDDIR/..
# Only disc 1 bootable
if [ $N != 1 ]; then
echo "-J" > $N.mkisofs_opts
exit 0;
fi
# Hack for bootable disks
mkdir -p boot1/boot
echo -n "-J boot1" > 1.mkisofs_opts
echo "extract aboot(bootlx) from sable set"
echo dump srmbootcode boot1/boot/bootlx |\
debugfs $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/sable/resc1440.bin
for subarch in avanti avanti-s xl xlt cabriolet eb66 eb66p eb64p eb164 pc164 \
lx164 sx164 jensen noname takara mikasa mikasa-p noritake noritake-p alcor miata \
sable sable-g book1 ruffian; do
mkdir boot1/boot/$subarch
echo "drive m: file=\"$CDDIR/dists/stable/main/disks-$ARCH/current/$subarch/resc1440.bin\"" > mtoolsrc.tmp
echo "extracting stuff for $subarch"
case $subarch in
jensen|noritake*|mikasa-p|sable*|book1|miata-s|avanti-s|generic)
echo dump linux boot1/boot/$subarch/linux |\
debugfs $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/$subarch/resc1440.bin
;;
ruffian)
MTOOLSRC=$CDDIR/../mtoolsrc.tmp mcopy m:linux m:milo m:ldmilo.exe boot1/boot/$subarch/.
;;
*)
MTOOLSRC=$CDDIR/../mtoolsrc.tmp mcopy m:linux m:milo m:linload.exe boot1/boot/$subarch/.
;;
esac
done
mkdir $CDDIR/tools/rawrite1
(cd $CDDIR/tools/rawrite1; \
unzip -Lq $MIRROR/tools/rawrite1.zip )
mkdir $CDDIR/tools/rawrite2
(cd $CDDIR/tools/rawrite2; \
unzip -Lq $MIRROR/tools/rawrite2.zip; \
rm rawrite2.c )
(echo "Tools for DOS :" ; \
echo "rawrite1/ rawrite 1.3 : create disks from disk images (*.bin)"; \
echo "rawrite2/ rawrite 2.0 : create disks from disk images (*.bin)"; \
echo " rawrite 2.0 is much faster, but it locks up on some machines";\
) |todos > $CDDIR/tools/README.tools
cp $CDDIR/tools/rawrite1/rawrite3.com $CDDIR/install/rw1_3.com
cp $CDDIR/tools/rawrite2/rawrite2.exe $CDDIR/install/rw2_0.exe
exit 0

182
tools/boot/slink/boot-m68k Executable file
View File

@ -0,0 +1,182 @@
#!/bin/bash
#
# boot-m68k v 1.13 (c) Steve McIntyre <stevem@chiark.greenend.org.uk>,
# Chris Lawrence <lawrencc@debian.org>, Christian Steigies <cts@debian.org>,
# Michael Schmitz <MSchmitz@lbl.gov>
# Released under GPL 31 Mar 1999
# See the file COPYING for license details
# Released as part of the slink_cd package, not much use standalone
#
# Do install stuff for m68k, including making bootable CDs
#
# Enjoy! This is all completely free.
# - Chris Lawrence <lawrencc@debian.org>
#
# Rewritten by Steve McIntyre <stevem@chiark.greenend.org.uk> in sh to
# interface better with the slink_cd package and cope with the mirror
# layout, 28 Feb 1999.
# Hopefully this will do the same job as the python map stuff did, it
# appears to...
#
# If you're burning a CD, use the mkhybrid in potato (HFS is broken in the
# slink version of mkhybrid; at least it is for me). Please don't use Joliet
# extensions; some Mac kernels have apparently been known to choke on them
# (and you really shouldn't be supporting a Microsoft Standard anyway :-)
#
# You may also want the following:
# * A copy of the Linux/m68k FAQ
# * A copy of my m68k-specific README and m68k-tools directories
# * The m68k kernel sources from sunsite.auc.dk:/projects/680x0
# (Sunsite-Denmark is rsync-capable at sunsite.auc.dk::ftp)
# I recommend getting the 2.0.36 and 2.2.1-pre2 sources at least.
# (Actually 2.0.36 is non-essential since it's on the CDs already;
# you probably DO want the 2.2.1-pre2 tree however [under v2.1!]).
#
# MVME/BVME users will love you if you also include the "tools" directory
# from the FTP site, since they may want/need rawwrite for MS-DOS.
#
# The first two items are in a tar file at master.debian.org:~lawrencc, along
# with a silly rsync script that will accomplish the last item.
N=$1
CDDIR=$2
cd $CDDIR/..
# Only disk 1 bootable
if [ $N != 1 ]; then
echo -n "--netatalk -j -hfs -probe -map $BASEDIR/data/hfs.map" \
> $N.mkisofs_opts
exit 0
fi
echo -n "--netatalk -j -hfs -probe -map $BASEDIR/data/hfs.map" \
> $N.mkisofs_opts
echo -n " -b install/bvme6000/resc1440.bin -c install/bvme6000/boot.catalog" \
>> $N.mkisofs_opts
DISKSROOT="$MIRROR/dists/$CODENAME/main/disks-$ARCH/current"
INSTALLDIR="$CDDIR/install"
cd $INSTALLDIR
#vecho Installing Amiga files
lha xqf $DISKSROOT/amiga/amigainstall.lha
mv debian amiga
mv debian.info amiga.info
cp $DISKSROOT/amiga/* amiga
# Needs to be executable
chmod a+x amiga/amiboot-5.6
# Add .info files for amiga
tar -C .. -xzf $BASEDIR/data/cts_amiga_info.tar.gz
for file in `tar tzf $BASEDIR/data/cts_amiga_info.tar.gz`
do
chmod a+r ../$file
done
# And fix a few things up...
mkdir common
mv basecont.txt.info common
mv ../README.info ../README.m68k.info
cp ../README.1ST.info ../README.multicd.info
#vecho Installing Atari files
lha xqf $DISKSROOT/atari/install.lzh
mv debian atari
cp $DISKSROOT/atari/* atari
#vecho Installing Mac files
tar -C .. -zxf $DISKSROOT/source/macinstall.tar.gz
cp $DISKSROOT/mac/* mac
for TYPE in common bvme6000 mvme162 mvme167 source
do
#vecho Installing $TYPE files
if [ ! -d $TYPE ] ; then
mkdir $TYPE
fi
cp $DISKSROOT/$TYPE/* $TYPE
done
vecho hexbin Mac files
cd $INSTALLDIR/mac
hexbin *.hqx
vecho Installing m68k FAQ and tools
mkdir $CDDIR/tmp
cd $CDDIR/tmp
tar xzf $BASEDIR/data/m68k-cd-misc.tar.gz
mv m68k-faq m68k-tools ..
mv update-kernels ../update-kernels.m68k
cd ..
rm -rf tmp
cd $CDDIR
# make mountpoint and temp HFS filesystem image
rm -rf /var/tmp/mnt-macinstall
mkdir /var/tmp/mnt-macinstall
dd if=/dev/zero of=/var/tmp/macinstall-temp.img bs=1024 count=1440
hformat /var/tmp/macinstall-temp.img
# mount it (':' is top dir) using hfsutils
hmount /var/tmp/macinstall-temp.img
# copy booter and preferences files in place (color table missing but
# Penguin-17 has colors fixed anyway
hcopy -b install/mac/Penguin-17.hqx :
hcopy -b install/mac/Penguin_Prefs.hqx :"Penguin Prefs"
hcopy -b "install/mac/Penguin_Prefs_(autoboot).hqx" :"Penguin Prefs (autoboot)"
# unmount HFS image
humount /var/tmp/macinstall-temp.img
# mount this HFS floppy image again as netatalk using the loopback mount command
if [ ! 'mount -t hfs -o loop,fork=netatalk,afpd /var/tmp/macinstall-temp.img /var/tmp/mnt-macinstall' ] ; then
# We managed to mount it loop-back
# copy over both Penguin-15 and .AppleDouble/Penguin-15
# copy over both Penguin Prefs and .AppleDouble/Penguin Prefs
# (.AppleDouble files go into .AppleDouble subdir of target dir)
cp /var/tmp/mnt-macinstall/Penguin* install/mac/
mkdir install/mac/.AppleDouble
cp /var/tmp/mnt-macinstall/.AppleDouble/Penguin* install/mac/.AppleDouble/
# unmount, cleanup
umount /var/tmp/mnt-macinstall
rm /var/tmp/macinstall-temp.img
rmdir /var/tmp/mnt-macinstall
else
# We failed to mount it. Use the fallback tar.gz that we have
echo HFS loopback mount failed on /var/tmp/macinstall-temp.img
echo This is not fatal, but check that you have permissions to do this
echo and that you have HFS support in your kernel...
echo Extracting $BASEDIR/data/macinstall-cd.tar.gz instead.
tar xzf $BASEDIR/data/macinstall-cd.tar.gz
fi
#
# can remove the .hqx stuff now I guess.
#
# make CD image using the command
# mkhybrid -map <mapfile> --netatalk -a -j -hfs -r -V <label> -o <image> <source dir>
#
# map file contains stuff like
# # ext. xlate creator type comment
# .hqx Ascii 'BnHx' 'TEXT' "BinHex file"
# .mov Raw 'TVOD' 'MooV' "QuickTime Movie"
# .deb Raw 'Debn' 'bina' "Debian package"
# .bin Raw 'Debn' 'bina' "Floppy or ramdisk image"
# * Ascii 'ttxt' 'TEXT' "Text file"
#
# Note that we can't use MacBinary mapping for .bin files due to
# name clashes with the binary image files, so we have to provide
# all encoded Mac files in BinHex format.
#
# Kudos Brad Midgley, <brad@pht.com> for the tricks!
#
# Possible alternative: convert .hqx in MacBinary files, but we'd need
# to use a different extension as .bin is taken by the disk images.
# i.e. hexbin -s Penguin-17.hqx > Penguin-17.mac
# and use .mac as MacBinary extension. I don't know offhand what the
# creator/type for MacBinary is. --netatalk would be replaced by
# --macbin, possibly together with --probe.

94
tools/boot/slink/boot-powerpc Executable file
View File

@ -0,0 +1,94 @@
#!/bin/bash
#
# boot-powerpc version 0.5 (c) Hartmut Koptein <koptein@debian.org>,
#
# Released under GPL 1 Mar 1999
# See the file COPYING for license details
# Released as part of the debian_cd package, not much use standalone
#
# Do install stuff for powerpc, including making bootable CDs
#
# $1 is the CD number
# $2 is the temporary CD build dir
N=$1
CDROOT=$2
cd $CDROOT/..
# Only disk 1 bootable
if [ $N != 1 ]; then
echo -n "--netatalk -j -hfs -probe -map $BASEDIR/data/hfs.map" \
> $N.mkisofs_opts
exit 0
fi
echo -n "--netatalk -j -hfs -probe -map $BASEDIR/data/hfs.map" \
> $N.mkisofs_opts
echo -n " -b install/prep/resc1440.bin -c install/prep/boot.catalog" \
>> $N.mkisofs_opts
DISKSROOT="$MIRROR/dists/$CODENAME/main/disks-$ARCH/current"
INSTALLDIR="$CDROOT/install"
cd $INSTALLDIR
# Debian/PowerPC consits currently for three parts: CHRP, PMac and PReP
# Apus, MBX and BBox will hopefully follow
#
#
# -- We need a generic boot-loader --
#
echo "Copying boot images to $CDROOT/boot for disc 1"
rm -fr boot
mkdir -p boot
for subarch in chrp powermac prep ; do
mkdir boot/$subarch
echo "extracting stuff for $subarch"
case $subarch in
chrp)
echo "need work for CHRP"
;;
powermac)
#cp -p $BOOTDIR/cd.b $BOOTDIR/second.b boot/powermac
#cp -p $BOOTDIR/second.b boot/powermac
#cat - > boot/powermac/quik.conf << __EOF__
#timeout=300
#root=/dev/ram
#image=!cd1
#label=Linux
#initrd=!cd5
#__EOF__
echo "need work for PowerMac"
;;
prep)
echo "need work for PReP"
;;
esac
done
cd $INSTALLDIR
#-------------- CHRP - Stuff -------------------------------
echo Installing CHRP files
mkdir chrp
cp $DISKSROOT/chrp/* chrp
#-------------- PMac - Stuff -------------------------------
echo Installing Power-Macintosh files
mkdir powermac
cp $DISKSROOT/powermac/* powermac
#-------------- PReP - Stuff -------------------------------
echo Installing PReP files
mkdir prep
cp $DISKSROOT/prep/* prep
#============== fix a few things up... =====================
echo Installing PowerPC FAQ and tools
mkdir common
#mv basecont.txt.info common
#mv ../README.info ../README.powerpc.info
#cp ../README.1ST.info ../README.multicd.info

75
tools/boot/slink/boot-sparc Executable file
View File

@ -0,0 +1,75 @@
#!/bin/bash
#
# boot-sparc v 1.13 (c) Steve Dunham <dunham@cse.msu.edu>, Eric
# Delaunay <delaunay@lix.polytechnique.fr>, Steve McIntyre
# <stevem@chiark.greenend.org.uk>
# Released under GPL 31 Mar 1999
# See the file COPYING for license details
# Released as part of the slink_cd package, not much use standalone
#
# Do install stuff for sparc, including making bootable CDs
N=$1
CDDIR=$2
cd $CDDIR/..
# Disk 1 only
if [ $N != 1 ]; then
:> $N.mkisofs_opts
exit 0;
fi
echo -n "boot1" > $N.mkisofs_opts
rm -fr boot1
# temporary mount point (eg. for silo to create the bootable CD image)
# only needed for Sparc so far...
#vecho Checking for temporary mount point for SILO
mountpoint=/var/tmp/debian_cd.mnt
if [ -d $mountpoint ]; then
umount $mountpoint || true
else
mkdir -p $mountpoint
fi
# put the relevant parts of SILO boot loader
mkdir -p boot1/boot
cp -p $BOOTDIR/cd.b $BOOTDIR/second.b boot1/boot
cat - > boot1/boot/silo.conf << __EOF__
message=!cd1
timeout=300
root=/dev/ram
image[sun4c,sun4d,sun4m]=!cd2
label=linux
initrd=!cd5
image[sun4u]=!cd4
label=linux
initrd=!cd5
image[sun4c,sun4d,sun4m]=!cd3
label=linux-2.2
initrd=!cd5
image[sun4u]=!cd4
label=linux-2.2
initrd=!cd5
__EOF__
# linux kernel & co are fetched directly from the install dir
# ... put the message banner in boot/debian.txt
(cd $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/ ; \
cp -p linux-a.out linux-2.2.1-sun4u-a.out \
linux-2.2.1-a.out root.bin sparc_release_note.txt \
$CDDIR/install )
#echo mount -r -o loop \
# $MIRROR/dists/$CODENAME/main/disks-$ARCH/current/resc1440.bin \
# $mountpoint
mount -r -o loop \
$MIRROR/dists/$CODENAME/main/disks-$ARCH/current/resc1440.bin \
$mountpoint
cp -p $mountpoint/debian.txt boot1/boot/debian.txt
umount $mountpoint