On 09/02/2017 12:01 PM, Finn Thain wrote: > 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...
We can use genisoimage, no problem. In fact, I am exclusively using it now. >>> 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. Just download the whole workspace, i.e. the ZIP file. It contains the 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. \o/ >> 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. Ok. So what do we need to make it work again? > 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? Yes, please. >> Can you update your patch using genisoimage rather than xorrisofs? >> > > OK. The patch below is now up-to-date? If yes, I'll apply it. 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 > -- .''`. John Paul Adrian Glaubitz : :' : Debian Developer - glaub...@debian.org `. `' Freie Universitaet Berlin - glaub...@physik.fu-berlin.de `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
