m68k support

debian/changelog

@@ -35,6 +35,8 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
         kernel-pcmcia-modules-2.4.22-xfs-386,
         kernel-pcmcia-modules-2.4.22-xfs-686-smp,
         kernel-source-2.2.20, timidity-patches, tcl8.2 and tk8.2.
+  * Stephen R. Marenka
+  	- m68k support.
 
  -- Raphael Hertzog <hertzog@debian.org>  Thu, 25 Mar 2004 07:33:23 +0100
 

tasks/base-sarge

@@ -680,6 +680,7 @@ pmac-fdisk-cross
 setserial
 vmelilo
 ipchains
+filesutils
 #endif
 
 #ifdef ARCH_powerpc

tasks/debian-installer

@@ -512,6 +512,7 @@ autopartkit
 base-installer
 baseconfig-udeb
 brltty-udeb
+bterm-unifont
 bugreporter-udeb
 cdebconf-text-udeb
 cdebootstrap-udeb
@@ -530,20 +531,20 @@ di-utils
 di-utils-mapdevfs
 discover-data-udeb
 discover-udeb
+discover1-data-udeb
+discover1-udeb
 discover2-data-udeb
 discover2-udeb
 e2fsprogs-udeb
 ethdetect
 evms-udeb
 fat-modules-2.2.25-mac-di
-fat-modules-2.4.24-amiga-di
+fat-modules-2.4.25-amiga-di
 fbset-udeb
 hw-detect-full
-ide-modules-2.2.25-mac-udeb
 ipv6-modules-2.2.25-mac-di
-ipv6-modules-2.2.25-mac-udeb
 iso-3166-udeb
-jfs-modules-2.4.24-amiga-di
+jfs-modules-2.4.25-amiga-di
 jfsutils-udeb
 kbd-chooser
 libblkid1-udeb
@@ -566,7 +567,7 @@ mkreiserfs-udeb
 net-retriever
 netcfg
 nic-shared-modules-2.2.25-mac-di
-nic-shared-modules-2.4.24-amiga-di
+nic-shared-modules-2.4.25-amiga-di
 nobootloader
 partconf
 partconf-find-partitions
@@ -584,16 +585,13 @@ partman-reiserfs
 partman-target
 partman-xfs
 ppp-modules-2.2.25-mac-di
-ppp-modules-2.2.25-mac-udeb
+ppp-modules-2.4.25-amiga-di
-ppp-modules-2.4.24-amiga-di
 ppp-udeb
 prebaseconfig
 raidtools2-udeb
-reiserfs-modules-2.4.24-amiga-di
+reiserfs-modules-2.4.25-amiga-di
 scsi-modules-2.2.25-mac-di
-scsi-modules-2.2.25-mac-udeb
+scsi-modules-2.4.25-amiga-di
-scsi-modules-2.4.24-amiga-di
-socket-modules-2.2.25-mac-udeb
 userdevfs
 wireless-tools-udeb
 xfsprogs-udeb

tasks/debian-installer+kernel

@@ -75,3 +75,12 @@ kernel-image-2.4.24-sparc32-smp
 kernel-image-2.4.24-sparc64
 kernel-image-2.4.24-sparc64-smp
 #endif
+#ifdef ARCH_m68k
+kernel-image-2.2.25-amiga
+kernel-image-2.2.25-atari
+kernel-image-2.2.25-bvme6000
+kernel-image-2.2.25-mac
+kernel-image-2.2.25-mvme147
+kernel-image-2.2.25-mvme16x
+kernel-image-2.4.25-amiga
+#endif

tools/boot/sarge/boot-m68k

@@ -0,0 +1,69 @@
+#!/bin/bash
+#
+# Do install stuff for m68k, including making bootable CDs for bvme6000
+# 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
+if [ "$DI_WWW_HOME" = "default" ];then
+   DI_WWW_HOME="http://people.debian.org/~smarenka/d-i/images-m68k/daily"
+fi
+if [ ! "$DI_DIST" ]; then
+   DI_DIST="$DI_CODENAME"
+fi
+
+DI_BOOTLOADER="http://people.debian.org/~smarenka/d-i/images-m68k/daily"
+
+cd $CDDIR/..
+
+echo -n "--netatalk -J -hfs -probe -map $BASEDIR/data/hfs.map" \
+        > $N.mkisofs_opts
+
+# Only disk 1 bootable
+if [ $N != 1 ]; then
+	exit 0
+fi
+
+install_languages $CDDIR
+
+# remove i386 stuff
+rm -rf $CDDIR/tools
+
+cd $INSTALLDIR
+# create directories for different sub-archs
+mkdir {amiga,atari,bvme6000,mac,mvme147,mvme16x}
+
+wget -O bootloaders.tar.bz2 "$DI_BOOTLOADER"/../../bootloaders.tar.bz2
+tar -xvjf bootloaders.tar.bz2
+rm bootloaders.tar.bz2
+
+if [ ! "$DI_WWW_HOME" ];then
+	DI_DIR="$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images"
+	cp "$DI_DIR"/amiga/nativehd-vmlinuz* amiga/vmlinuz
+	cp "$DI_DIR"/mac/nativehd-vmlinuz* mac/vmlinuz
+	cp "$DI_DIR/cdrom-initrd.gz" root.bin
+else
+	kernel_amiga=$(wget "$DI_WWW_HOME/amiga/" -O - | \
+	sed -n 's/.*a href="\(nativehd-vmlinuz-[0-9\.]\+-amiga\)".*/\1/p')
+	kernel_mac=$(wget "$DI_WWW_HOME/mac/" -O - | \
+	sed -n 's/.*a href="\(nativehd-vmlinuz-[0-9\.]\+-mac\)".*/\1/p')
+	wget -O amiga/vmlinuz "$DI_WWW_HOME/amiga/$kernel_amiga"
+	wget -O mac/vmlinuz "$DI_WWW_HOME/mac/$kernel_mac"
+	wget -O root.bin "$DI_WWW_HOME/cdrom-initrd.gz"
+fi
+
+# Amiboot needs to be executable
+chmod a+x amiga/amiboot-5.6
+
+# Need a .info file for the install directory (AmigaOS) (icon?)
+cp amiga/amiga.info  $CDDIR/install.info
+
+##-----------------------------< end of file >------------------------------##

tools/generate_di+k_list

@@ -127,6 +127,20 @@ EOF
   $MIRROR/dists/$CODENAME/main/binary-sparc/Packages \
   >> debian-installer+kernel
 
+cat >> debian-installer+kernel << EOF
+#endif
+#ifdef ARCH_m68k
+EOF
+
+# Get all the 2.2 kernels
+/bin/sed -n 's/Package: \(kernel-image-2.2.*\)$/\1/p' \
+  $MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 6 \
+  >> debian-installer+kernel
+# Get the latest 2.4 kernel for amiga
+/bin/sed -n 's/Package: \(kernel-image-2.4.*-amiga\)$/\1/p' \
+  $MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 1 \
+  >> debian-installer+kernel
+
 cat >> debian-installer+kernel << EOF
 #endif
 EOF