CVS commit: [netbsd-4] src/distrib/cdrom

[Matthias Scheler <tron%netbsd.org@localhost>]

Module Name:    src
Committed By:   tron
Date:           Mon Sep 25 21:51:39 UTC 2006

Modified Files:
        src/distrib/cdrom [netbsd-4]: Makefile NetBSD-4.0.mk NetBSD-current.mk
        src/distrib/cdrom/macppc_installboot [netbsd-4]: Makefile
Added Files:
        src/distrib/cdrom/macppc_installboot [netbsd-4]: cd9660.c cd9660_util.c
            installboot.c installboot.h
        src/distrib/cdrom/macppc_mkboothfs [netbsd-4]: Makefile mkboothfs.c
Removed Files:
        src/distrib/cdrom/macppc_installboot [netbsd-4]: bootxx.raw.uue
            macppc_installboot.c macppcboot.raw.uue mkmacppcboot.c

Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #172):
        distrib/cdrom/macppc_installboot/macppc_installboot.c: file removal
        distrib/cdrom/macppc_installboot/cd9660_util.c: revision 1.1
        distrib/cdrom/Makefile: revision 1.29
        distrib/cdrom/macppc_mkboothfs/Makefile: revision 1.1
        distrib/cdrom/macppc_installboot/bootxx.raw.uue: file removal
        distrib/cdrom/NetBSD-current.mk: revision 1.5
        distrib/cdrom/macppc_mkboothfs/mkboothfs.c: revision 1.1
        distrib/cdrom/macppc_installboot/mkmacppcboot.c: file removal
        distrib/cdrom/macppc_installboot/macppcboot.raw.uue: file removal
        distrib/cdrom/macppc_installboot/cd9660.c: revision 1.1
        distrib/cdrom/macppc_installboot/Makefile: revision 1.6
        distrib/cdrom/NetBSD-4.0.mk: revision 1.2
        distrib/cdrom/macppc_installboot/installboot.c: revision 1.1
        distrib/cdrom/macppc_installboot/installboot.h: revision 1.1
Reorganize macppc_installboot to make macppccd.iso image actually bootable
on (some) OpenFirmware 2.x machines.
Current macppccd.iso image doesn't boot on Openfirmware 2.x
(and probably 1.0.5) machines because it uses pre-compiled binary
which is based on old (and customized) bootxx.
It causes version mismatch against newer ofwboot whose load address
has been changed from 0x600000 to 0xe00000, as mentioned in the
following post:
http://mail-index.netbsd.org/port-macppc/2004/12/14/0020.html
There was also an raw binary which was passed to mkisofs as -boot-hfs-file.
To fix these issue, prepare a simple mkhfsboot program which creates
a boothfs file with the Apple partition map info for mkisofs,
and modify macppc_installboot to search the secondary ofwboot from isofs
and to put and modify the primary bootxx accordingly.
See PR toolchain/30245 for more details.
There are still some machines which don't boot from an iso image created
by this method (G3 machines with OF 2.0f1 etc.), but it's still better
than to keep ugly and obsolete hacks.
Ok'ed by macallan, and there is no other particular comment about this PR.


To generate a diff of this commit:
cvs rdiff -r1.27.2.1 -r1.27.2.2 src/distrib/cdrom/Makefile
cvs rdiff -r1.2.2.1 -r1.2.2.2 src/distrib/cdrom/NetBSD-4.0.mk
cvs rdiff -r1.4 -r1.4.2.1 src/distrib/cdrom/NetBSD-current.mk
cvs rdiff -r1.5 -r1.5.12.1 src/distrib/cdrom/macppc_installboot/Makefile
cvs rdiff -r1.1 -r0 src/distrib/cdrom/macppc_installboot/bootxx.raw.uue \
    src/distrib/cdrom/macppc_installboot/macppcboot.raw.uue \
    src/distrib/cdrom/macppc_installboot/mkmacppcboot.c
cvs rdiff -r0 -r1.1.2.1 src/distrib/cdrom/macppc_installboot/cd9660.c \
    src/distrib/cdrom/macppc_installboot/cd9660_util.c \
    src/distrib/cdrom/macppc_installboot/installboot.c \
    src/distrib/cdrom/macppc_installboot/installboot.h
cvs rdiff -r1.2 -r0 src/distrib/cdrom/macppc_installboot/macppc_installboot.c
cvs rdiff -r0 -r1.1.2.1 src/distrib/cdrom/macppc_mkboothfs/Makefile \
    src/distrib/cdrom/macppc_mkboothfs/mkboothfs.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.