diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2004-12-03 06:37:52 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2004-12-03 06:37:52 +0000 |
| commit | 50e07ad23fbffea09191be4e33f4ad94014f01c0 (patch) | |
| tree | 1804ecb865c34b23c064f8cdd8e00a644c1eb0d0 /distrib | |
| parent | 6f0ccd40f1d52ff46d7197782cbab9b34f743317 (diff) | |
Kill mac68k *SBC kernels. Instead, build kernels with both sbc scsi flavours
compiled in, but one disabled, and use config -e to swap them and build
the other kernels; saves valuable compile time.
Add ramdisks into the build (at release time). Since we are moving to a
bsd.rd installation, it is not necessary to put kernels in .tgz files
anymore, so don't bother, and adjust installation script sets information
accordingly.
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/mac68k/ramdisk/Makefile | 21 | ||||
| -rw-r--r-- | distrib/mac68k/ramdisk/install.md | 4 |
2 files changed, 7 insertions, 18 deletions
diff --git a/distrib/mac68k/ramdisk/Makefile b/distrib/mac68k/ramdisk/Makefile index 811ba01fcd0..68c3e7f528f 100644 --- a/distrib/mac68k/ramdisk/Makefile +++ b/distrib/mac68k/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2002/04/30 09:18:20 deraadt Exp $ +# $OpenBSD: Makefile,v 1.6 2004/12/03 06:37:48 miod Exp $ TOP= ${.CURDIR}/.. @@ -23,16 +23,12 @@ DISKTYPE= rdroot NBLKS= 2880 NEWFSARGS= -t ffs -m 0 -o space -u 32 -c 16 -b 4096 -all: ${BSD_RD} ${BSDSBC_RD} +all: ${BSD_RD} ${BSD_RD}: ${CBIN} ${IMAGE} bsd rdsetroot cp bsd ${BSD_RD} ${.OBJDIR}/rdsetroot ${BSD_RD} < ${IMAGE} -${BSDSBC_RD}: ${CBIN} ${IMAGE} bsdsbc rdsetroot - cp bsdsbc ${BSDSBC_RD} - ${.OBJDIR}/rdsetroot ${BSDSBC_RD} < ${IMAGE} - ${IMAGE}: rd_setup do_files rd_teardown bsd: @@ -43,14 +39,6 @@ bsd: .endif cp ${.CURDIR}/../../../sys/arch/mac68k/compile/RAMDISK/bsd bsd -bsdsbc: -.ifndef(NOBUILD) - cd ${.CURDIR}/../../../sys/arch/mac68k/conf && config RAMDISKSBC - cd ${.CURDIR}/../../../sys/arch/mac68k/compile/RAMDISKSBC && \ - make clean && make depend && make -.endif - cp ${.CURDIR}/../../../sys/arch/mac68k/compile/RAMDISKSBC/bsd bsdsbc - rd_setup: dd if=/dev/zero of=${IMAGE} bs=512 count=${NBLKS} vnconfig -v -c ${VND} ${IMAGE} @@ -75,7 +63,8 @@ unconfig: install: cp ${BSD_RD} ${DESTDIR}/snapshot/${BSD_RD} - cp ${BSDSBC_RD} ${DESTDIR}/snapshot/${BSDSBC_RD} + printf "disable ncrscsi\nenable sbc\nquit" | config -e \ + -o ${DESTDIR}/snapshot/${BSDSBC_RD} ${DESTDIR}/snapshot/${BSD_RD} ${CBIN}.conf: ${LISTS} awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf @@ -95,7 +84,7 @@ do_files: clean cleandir: /bin/rm -f core ${IMAGE} ${CBIN} ${CBIN}.conf ${CBIN}.mk ${CBIN}.cache \ - *.o *.lo *.c bsd bsdmix bsdofw ${BSD_RD} ${BSDSBC_RD} \ + *.o *.lo *.c bsd bsdmix bsdofw ${BSD_RD} \ rdsetroot .include <bsd.obj.mk> diff --git a/distrib/mac68k/ramdisk/install.md b/distrib/mac68k/ramdisk/install.md index cedfb2f3c64..e248baa8d9e 100644 --- a/distrib/mac68k/ramdisk/install.md +++ b/distrib/mac68k/ramdisk/install.md @@ -1,4 +1,4 @@ -# $OpenBSD: install.md,v 1.22 2004/12/03 06:30:00 miod Exp $ +# $OpenBSD: install.md,v 1.23 2004/12/03 06:37:49 miod Exp $ # # Copyright (c) 2002, Miodrag Vallat. # All rights reserved. @@ -63,7 +63,7 @@ # # Machine-dependent install sets -MDSETS="bsd.tgz bsd-sbc.tgz" +MDSETS="bsdsbc bsdsbc.rd" MDTERM=vt100 ARCH=ARCH |