diff -urN src/release/Makefile /home/refugee/freebsd/src/release/Makefile --- src/release/Makefile Thu Mar 25 15:37:59 2004 +++ /home/refugee/freebsd/src/release/Makefile Wed Apr 7 04:26:49 2004 @@ -205,6 +205,12 @@ MFSINODE= 8192 MFSLABEL= auto NO_FLOPPIES= +.elif ${TARGET_ARCH} == "powerpc" +DISKLABEL= "" +MFSSIZE= 4096 +MFSINODE= 8192 +MFSLABEL= auto +NO_FLOPPIES= .endif .if exists(/sbin/bsdlabel) @@ -709,7 +715,7 @@ -test -f ${.CURDIR}/install.cfg \ && cp ${.CURDIR}/install.cfg ${RD}/mfsfd @mkdir -p ${RD}/mfsfd/boot -.if ${TARGET_ARCH} != "ia64" +.if ${TARGET_ARCH} != "ia64" && ${TARGET_ARCH} != "powerpc" @cp ${RD}/trees/base/boot/boot* ${RD}/mfsfd/boot .endif .if ${TARGET} == "i386" || ${TARGET_ARCH} == "amd64" diff -urN src/release/powerpc/boot.tbxi /home/refugee/freebsd/src/release/powerpc/boot.tbxi --- src/release/powerpc/boot.tbxi Wed Dec 31 19:00:00 1969 +++ /home/refugee/freebsd/src/release/powerpc/boot.tbxi Fri Apr 9 23:14:38 2004 @@ -0,0 +1,11 @@ + + +MacRISC MacRISC3 MacRISC4 + + +FreeBSD/PPC bootloader + + +boot cd:,\boot\loader cd:0 + + diff -urN src/release/powerpc/boot_crunch.conf /home/refugee/freebsd/src/release/powerpc/boot_crunch.conf --- src/release/powerpc/boot_crunch.conf Wed Dec 31 19:00:00 1969 +++ /home/refugee/freebsd/src/release/powerpc/boot_crunch.conf Wed Apr 7 01:09:17 2004 @@ -0,0 +1,29 @@ +# $FreeBSD $ + +buildopts -DRELEASE_CRUNCH -Dlint + +srcdirs /usr/src/bin +progs hostname pwd rm sh test +ln sh -sh +ln test [ + +srcdirs /usr/src/gnu/usr.bin +progs cpio + +srcdirs /usr/src/sbin +progs dhclient fsck_ffs ifconfig +progs mount_msdosfs mount_nfs newfs newfs_msdos route rtsol +progs slattach tunefs camcontrol + +srcdirs /usr/src/usr.bin +progs find minigzip sed +ln minigzip gzip +ln minigzip gunzip +ln minigzip zcat + +srcdirs /usr/src/usr.sbin +progs arp ppp +progs sysinstall usbd usbdevs + +libs -ll -ledit -lutil -lkvm -lmd -lcrypt -lftpio -lz -lnetgraph +libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs diff -urN src/release/powerpc/hfs.map /home/refugee/freebsd/src/release/powerpc/hfs.map --- src/release/powerpc/hfs.map Wed Dec 31 19:00:00 1969 +++ /home/refugee/freebsd/src/release/powerpc/hfs.map Sun Apr 11 16:22:30 2004 @@ -0,0 +1,2 @@ +.tbxi - 'chrp' 'tbxi' "bootstrap" +* - 'fbsd' 'TEXT' "FreeBSD file" \ No newline at end of file diff -urN src/release/powerpc/mkisoimages.sh /home/refugee/freebsd/src/release/powerpc/mkisoimages.sh --- src/release/powerpc/mkisoimages.sh Wed Dec 31 19:00:00 1969 +++ /home/refugee/freebsd/src/release/powerpc/mkisoimages.sh Sun Apr 11 16:15:35 2004 @@ -0,0 +1,57 @@ +#!/bin/sh +# +# Module: mkisoimages.sh +# Author: Jordan K Hubbard +# Date: 22 June 2001 +# +# $FreeBSD: src/release/sparc64/mkisoimages.sh,v 1.3 2003/08/11 22:27:43 ru Exp $ +# +# This script is used by release/Makefile to build the (optional) ISO images +# for a FreeBSD release. It is considered architecture dependent since each +# platform has a slightly unique way of making bootable CDs. This script +# is also allowed to generate any number of images since that is more of +# publishing decision than anything else. +# +# Usage: +# +# mkisoimages.sh [-b] image-label image-name base-bits-dir [extra-bits-dir] +# +# Where -b is passed if the ISO image should be made "bootable" by +# whatever standards this architecture supports (may be unsupported), +# image-label is the ISO image label, image-name is the filename of the +# resulting ISO image, base-bits-dir contains the image contents and +# extra-bits-dir, if provided, contains additional files to be merged +# into base-bits-dir as part of making the image. + +if [ "x$1" = "x-b" ]; then + cp /usr/src/release/powerpc/boot.tbxi ${4}/boot + bootable="-hfs-bless ${4}/boot -map /usr/src/release/powerpc/hfs.map" + shift +else + bootable="" +fi + +if [ $# -lt 3 ]; then + echo Usage: $0 '[-b] image-label image-name base-bits-dir [extra-bits-dir]' + rm -f ${IMG} + exit 1 +fi + +type mkisofs 2>&1 | grep " is " >/dev/null +if [ $? -ne 0 ]; then + echo The mkisofs port is not installed. Trying to get it now. + if [ -f /usr/ports/sysutils/mkisofs/Makefile ]; then + cd /usr/ports/sysutils/mkisofs && make install && make clean + else + if ! pkg_add -r mkisofs; then + echo "Could not get it via pkg_add - please go install this" + echo "from the ports collection and run this script again." + exit 2 + fi + fi +fi + +LABEL=$1; shift +NAME=$1; shift + +mkisofs $bootable -r -hfs -part -no-desktop -hfs-volid $LABEL -l -J -L -o $NAME $* diff -urN src/release/scripts/doFS.sh /home/refugee/freebsd/src/release/scripts/doFS.sh --- src/release/scripts/doFS.sh Wed Jan 28 17:44:17 2004 +++ /home/refugee/freebsd/src/release/scripts/doFS.sh Sun Apr 11 16:31:41 2004 @@ -71,10 +71,14 @@ trap "umount ${MNT}; mdconfig -d -u ${MDDEVICE}" EXIT - ${DISKLABEL} ${MACHINE} -w ${BOOT} ${MDDEVICE} ${FSLABEL} - newfs -O1 -i ${FSINODE} -o space -m 0 /dev/${MDDEVICE}c - - mount /dev/${MDDEVICE}c ${MNT} + if [ "x${DISKLABEL}" != "x" ] ; then + ${DISKLABEL} ${MACHINE} -w ${BOOT} ${MDDEVICE} ${FSLABEL} + newfs -O1 -i ${FSINODE} -o space -m 0 /dev/${MDDEVICE}c + mount /dev/${MDDEVICE}c ${MNT} + else + newfs -O1 -i ${FSINODE} -o space -m 0 /dev/${MDDEVICE} + mount /dev/${MDDEVICE} ${MNT} + fi } rm -f ${FSIMG}