diff options
Diffstat (limited to 'distrib/sparc')
-rw-r--r-- | distrib/sparc/floppies/Makefile.inc | 5 | ||||
-rw-r--r-- | distrib/sparc/floppies/inst-common/Makefile.inc | 13 | ||||
-rw-r--r-- | distrib/sparc/floppies/inst/Makefile | 4 | ||||
-rw-r--r-- | distrib/sparc/floppies/kernel/Makefile | 28 | ||||
-rw-r--r-- | distrib/sparc/floppies/kernel/list | 4 | ||||
-rw-r--r-- | distrib/sparc/floppies/upgr/Makefile | 4 |
6 files changed, 36 insertions, 22 deletions
diff --git a/distrib/sparc/floppies/Makefile.inc b/distrib/sparc/floppies/Makefile.inc index ea83dc284f3..16a5151de7d 100644 --- a/distrib/sparc/floppies/Makefile.inc +++ b/distrib/sparc/floppies/Makefile.inc @@ -1,4 +1,3 @@ -# $Id: Makefile.inc,v 1.1 1995/10/27 22:27:49 deraadt Exp $ +# $Id: Makefile.inc,v 1.2 1996/10/08 19:39:49 deraadt Exp $ -# Revision is 1.0A -REV= 10A +REV= 20 diff --git a/distrib/sparc/floppies/inst-common/Makefile.inc b/distrib/sparc/floppies/inst-common/Makefile.inc index dcc651b9618..3fe9a4cd104 100644 --- a/distrib/sparc/floppies/inst-common/Makefile.inc +++ b/distrib/sparc/floppies/inst-common/Makefile.inc @@ -1,4 +1,4 @@ -# $Id: Makefile.inc,v 1.1 1995/10/27 22:39:52 deraadt Exp $ +# $Id: Makefile.inc,v 1.2 1996/10/08 19:39:52 deraadt Exp $ # TOP is assumed to be defined by Makefile including this one. @@ -9,7 +9,9 @@ MOUNT_POINT?= /mnt VND?= vnd0 VND_DEV= /dev/${VND}c VND_RDEV= /dev/r${VND}c -IMAGE?= xxx-${REV}.fs +PID!= echo $$$$ +REALIMAGE!= echo /tmp/image.${PID} +IMAGE?= inst${REV}.fs MDEC= ${DESTDIR}/usr/mdec LISTS= ${COMMONDIR}/list ${.CURDIR}/list @@ -17,8 +19,8 @@ CRUNCHCONF= ${COMMONDIR}/${CBIN}.conf MTREE= ${COMMONDIR}/mtree.conf all: ${CBIN} - dd if=/dev/zero of=${IMAGE} bs=120k count=12 - vnconfig -v -c ${VND_DEV} ${IMAGE} + dd if=/dev/zero of=${REALIMAGE} bs=120k count=12 + vnconfig -v -c ${VND_DEV} ${REALIMAGE} newfs -O -m 0 -o space -i 5120 -c 80 ${VND_RDEV} floppy mount ${VND_DEV} ${MOUNT_POINT} mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u @@ -27,6 +29,9 @@ all: ${CBIN} df -i ${MOUNT_POINT} umount ${MOUNT_POINT} vnconfig -u ${VND_DEV} + cat /bin/* > /dev/null # flush buffer cache (yuck) + cp ${REALIMAGE} ${IMAGE} + rm ${REALIMAGE} unconfig: -umount -f ${MOUNT_POINT} diff --git a/distrib/sparc/floppies/inst/Makefile b/distrib/sparc/floppies/inst/Makefile index 77e4cac37bc..a130a82ce6f 100644 --- a/distrib/sparc/floppies/inst/Makefile +++ b/distrib/sparc/floppies/inst/Makefile @@ -1,8 +1,8 @@ -# $Id: Makefile,v 1.1 1995/10/27 22:39:37 deraadt Exp $ +# $Id: Makefile,v 1.2 1996/10/08 19:39:51 deraadt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" -IMAGE= inst-${REV}.fs +IMAGE= inst${REV}.fs .include "${TOP}/inst-common/Makefile.inc" diff --git a/distrib/sparc/floppies/kernel/Makefile b/distrib/sparc/floppies/kernel/Makefile index f44a39ac91f..781c468ff2a 100644 --- a/distrib/sparc/floppies/kernel/Makefile +++ b/distrib/sparc/floppies/kernel/Makefile @@ -1,4 +1,4 @@ -# $Id: Makefile,v 1.1 1995/10/27 22:40:01 deraadt Exp $ +# $Id: Makefile,v 1.2 1996/10/08 19:39:53 deraadt Exp $ .include "../Makefile.inc" @@ -6,26 +6,36 @@ MOUNT_POINT?= /mnt VND?= vnd0 VND_DEV= /dev/${VND}c VND_RDEV= /dev/r${VND}c -IMAGE?= xxx-${REV}.fs +IMAGE= kc${REV}.fs +PID!= echo $$$$ +REALIMAGE!= echo /tmp/image.${PID} MDEC= ${DESTDIR}/usr/mdec LISTS= ${.CURDIR}/list -all: - dd if=/dev/zero of=${IMAGE} bs=120k count=12 - vnconfig -v -c ${VND_DEV} ${IMAGE} - -disklabel -w -r ${IMAGE} floppy - newfs -O -m 0 -o space -i 6144 -c 80 ${VND_RDEV} floppy +bsd: + cd ${.CURDIR}/../../../../sys/arch/sparc/conf && config FLOPPY + cd ${.CURDIR}/../../../../sys/arch/sparc/compile/FLOPPY && \ + make clean && make depend && make + cp ${.CURDIR}/../../../../sys/arch/sparc/compile/FLOPPY/bsd bsd + +all: bsd + dd if=/dev/zero of=${REALIMAGE} bs=10k count=144 + vnconfig -v -c ${VND_DEV} ${REALIMAGE} + #disklabel -w ${VND_RDEV} floppy + newfs -O -m 0 -o space -i 8192 -c 80 ${VND_RDEV} floppy mount ${VND_DEV} ${MOUNT_POINT} TOPDIR=${.CURDIR}/.. CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \ TARGDIR=${MOUNT_POINT} sh ${.CURDIR}/../runlist.sh ${LISTS} install -c -o root -g wheel -m 0440 ${MDEC}/boot ${MOUNT_POINT}/boot - cat /bin/* > /dev/null # flush buffer cache (yuck) - installboot -v ${MOUNT_POINT}/boot ${MDEC}/bootxx ${IMAGE} + installboot -v ${MOUNT_POINT}/boot ${MDEC}/bootxx ${VND_RDEV} mtree -def ${.CURDIR}/mtree.conf -p ${MOUNT_POINT}/ -u df -i ${MOUNT_POINT} umount ${MOUNT_POINT} vnconfig -u ${VND_DEV} + cat /bin/* > /dev/null # flush buffer cache (yuck) + cp ${REALIMAGE} ${IMAGE} + rm ${REALIMAGE} unconfig: -umount -f ${MOUNT_POINT} diff --git a/distrib/sparc/floppies/kernel/list b/distrib/sparc/floppies/kernel/list index 0fc83e989af..1254e1a4d92 100644 --- a/distrib/sparc/floppies/kernel/list +++ b/distrib/sparc/floppies/kernel/list @@ -1,4 +1,4 @@ -# $Id: list,v 1.1 1995/10/27 22:40:02 deraadt Exp $ +# $Id: list,v 1.2 1996/10/08 19:39:54 deraadt Exp $ # copy the kernel -COPY ${CURDIR}/../../../../sys/arch/sparc/compile/FLOPPY/bsd bsd +COPY bsd bsd diff --git a/distrib/sparc/floppies/upgr/Makefile b/distrib/sparc/floppies/upgr/Makefile index bc46cc6027e..466aebe921b 100644 --- a/distrib/sparc/floppies/upgr/Makefile +++ b/distrib/sparc/floppies/upgr/Makefile @@ -1,8 +1,8 @@ -# $Id: Makefile,v 1.1 1995/10/27 22:40:04 deraadt Exp $ +# $Id: Makefile,v 1.2 1996/10/08 19:39:55 deraadt Exp $ TOP= ${.CURDIR}/.. .include "${TOP}/Makefile.inc" -IMAGE= upgr-${REV}.fs +IMAGE= upgr${REV}.fs .include "${TOP}/inst-common/Makefile.inc" |