On Sat, 2 Sep 2017, John Paul Adrian Glaubitz wrote: > On 09/02/2017 05:34 AM, Finn Thain wrote: > > The "-probe" and "--netatalk" options are not listed in the upstream > > man page for xorrisofs which makes me think that both the m68k and the > > powerpc code here has bit-rotted. > > No, not bit-rotted. But rather, they were never implemented in xorrisofs > which is used these days instead of the classic mkisofs. There is still > genisoimage from the cdrkit package which is a fork of the original > cdrecord and hence the original mkisofs. I was just using the wrong > tool. >
I think we can get by with xorrisofs if that's somehow the "right" tool. But genisoimage may allow us to create an HFS/ISO9660 hybrid, which may be helpful if it allows us to avoid Binhex format for the bootloader or if it helps create a bootable CD... > > The hfs options look okay but they are for yaboot on PowerMacs. To > > create bootable CD for 68k Macs would be a different process (using > > EMILE SCSI CD-ROM drivers) etc. > > Laurent probably knows what to do here :). > > > I was going to download a daily build of the powermac installer to see > > how that works, but I found that there is no powerpc installer any > > more. > > There is here: > > > http://jenkins.kfreebsd.eu/jenkins/view/cd/job/debian-cd_sid_powerpc/ws/ > The logs there show that it has been built but I don't know where to get the result. > > Interestingly, there's not much use of HFS in there, but it mounts > > just fine under System 7. So I suspect we need the "-iso-level 4" > > option. Please see patch below. > > Try the above image first and let me know if it mounts. I will also > recreate the m68k image using genisomage. > ... > Try this image: > > https://people.debian.org/~glaubitz/debian-cd/2017-09-02/debian-9.0-m68k-NE$ > That one mounted fine in Mac OS (System 7.5), which is great. > >>> That tar archive has the crucial initrd and kernel binary, but the > >>> Mac tools have gone missing (Amiga and Atari tools are present > >>> though). It would be good to get the hqx files included again. > >>> Should I send a patch, or is that code still in the repo? > >> > >> Looks like it's missing. I think it's included in the d-i build from > >> individual packages. Was it part of m68kboot? [1] > >> > > > > Was that package the origin of, for example, the bootstra.tos or > > amiboot files that appear in the tar file: > > > > installer-m68k/20170828/images/tools/amiga/amiboot > > installer-m68k/20170828/images/tools/atari/bootstra.tos > > > > The changelog dates back to 2005: > > > > > > m68kboot (6.0+cvs.20050629-1.1) unreleased; urgency=low > > > > * Non-maintainer upload. > > * Upload to debian-ports.org unreleased as it got removed from sid. > > > > -- Thorsten Glaser <[email protected]> Sun, 29 May 2011 03:14:27 +0000 > > > Well, as you can see from the changelog, Thorsten made a custom upload > of that package during the time when he was working on the m68k port. He > was most likely just forgetting to include any Mac-related stuff. > No, the mac stuff isn't in either upload. > > m68kboot (6.0+cvs.20050629-1) unstable; urgency=low > > > > * Initial Release. > > > > -- Stephen R. Marenka <[email protected]> Wed, 29 Jun 2005 20:28:20 > > -0500 > > > > Stephen's upload is here, BTW. http://archive.debian.org/debian/pool/main/m/m68kboot/ Should I send you a tar file with install/tools/mac/Penguin-19 binaries? > > > This patch sync's up the boot-m68k scripts with boot-powerpc, and > > drops some options that aren't implemented by xorrisofs and aren't > > needed by m68k. > > Can you update your patch using genisoimage rather than xorrisofs? > OK. > See "man genisoimage". > > Adrian > > This debian-cd patch sync's up the boot-m68k scripts with boot-powerpc scripts, making the powerpc and m68k scripts more alike and thus easier to compare. The --iso-level option may improve compatibility. (BTW, the same option is called "-iso-level" in the xorrisofs man page.) diff --git a/tools/boot/buster/boot-m68k b/tools/boot/buster/boot-m68k index 9c6d53c..b298b96 100755 --- a/tools/boot/buster/boot-m68k +++ b/tools/boot/buster/boot-m68k @@ -29,16 +29,19 @@ fi cd $CDDIR/.. -# Recommended size for a HFS Catalog is 4 megas per giga, defaults to 4 megas -# MAXDISKBLOCKS is measured in 2K blocks -newsize=`echo "$MAXDISKBLOCKS * 2048 / 256" | bc` -add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs-parms MAX_XTCSIZE=$newsize" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long" + +add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--iso-level 4" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--netatalk" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-probe" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-map $BASEDIR/data/hfs.map" +# Recommended size for a HFS Catalog is 4 megas per giga, defaults to 4 megas +# MAXDISKBLOCKS is measured in 2K blocks +newsize=`echo "$MAXDISKBLOCKS * 2048 / 256" | bc` +add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs-parms MAX_XTCSIZE=$newsize" + # Only disk 1 bootable if [ $N != 1 ]; then exit 0 diff --git a/tools/boot/jessie/boot-m68k b/tools/boot/jessie/boot-m68k index 3183a09..378373f 100755 --- a/tools/boot/jessie/boot-m68k +++ b/tools/boot/jessie/boot-m68k @@ -29,16 +29,19 @@ fi cd $CDDIR/.. -# Recommended size for a HFS Catalog is 4 megas per giga, defaults to 4 megas -# MAXDISKBLOCKS is measured in 2K blocks -newsize=`echo "$MAXDISKBLOCKS * 2048 / 256" | bc` -add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs-parms MAX_XTCSIZE=$newsize" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long" + +add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--iso-level 4" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--netatalk" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-probe" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-map $BASEDIR/data/hfs.map" +# Recommended size for a HFS Catalog is 4 megas per giga, defaults to 4 megas +# MAXDISKBLOCKS is measured in 2K blocks +newsize=`echo "$MAXDISKBLOCKS * 2048 / 256" | bc` +add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs-parms MAX_XTCSIZE=$newsize" + # Only disk 1 bootable if [ $N != 1 ]; then exit 0 diff --git a/tools/boot/stretch/boot-m68k b/tools/boot/stretch/boot-m68k index 9c6d53c..b298b96 100755 --- a/tools/boot/stretch/boot-m68k +++ b/tools/boot/stretch/boot-m68k @@ -29,16 +29,19 @@ fi cd $CDDIR/.. -# Recommended size for a HFS Catalog is 4 megas per giga, defaults to 4 megas -# MAXDISKBLOCKS is measured in 2K blocks -newsize=`echo "$MAXDISKBLOCKS * 2048 / 256" | bc` -add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs-parms MAX_XTCSIZE=$newsize" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-J -joliet-long" + +add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--iso-level 4" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "--netatalk" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-probe" add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-map $BASEDIR/data/hfs.map" +# Recommended size for a HFS Catalog is 4 megas per giga, defaults to 4 megas +# MAXDISKBLOCKS is measured in 2K blocks +newsize=`echo "$MAXDISKBLOCKS * 2048 / 256" | bc` +add_mkisofs_opt $CDDIR/../$N.mkisofs_opts "-hfs-parms MAX_XTCSIZE=$newsize" + # Only disk 1 bootable if [ $N != 1 ]; then exit 0
