From f96ec528a45c8546ea7481721982d6bd213907a0 Mon Sep 17 00:00:00 2001 From: fredb Date: Fri, 17 Dec 1999 20:48:06 +0000 Subject: [PATCH] Changes to mac68k instkernel - - Don't descend into miniroot. This permits "make clean" and "make obj" from within /usr/src/distrib to succeed. - - Don't strip the install kernel--I need this to boot. - - Add release target, for use by "make release" in top level src dir. - - Ramdisk now builds in "notes" dir before reaching into it. - - Ramdisk unconfigures vnd when make is interrupted, by Ctl-C, for example. It would be nice to unconfigure the vnd device if the make fails for any reason, but I can't figure out how to do that. --- distrib/mac68k/Makefile | 4 ++-- distrib/mac68k/instkernel/Makefile | 4 +++- distrib/mac68k/instkernel/instkernel/Makefile | 24 +++++++++++++------ distrib/mac68k/instkernel/ramdisk/Makefile | 14 ++++++++--- distrib/mac68k/instkernel/ramdisk/list | 4 ++-- 5 files changed, 35 insertions(+), 15 deletions(-) diff --git a/distrib/mac68k/Makefile b/distrib/mac68k/Makefile index 6c696a92ad97..1297770a683e 100644 --- a/distrib/mac68k/Makefile +++ b/distrib/mac68k/Makefile @@ -1,5 +1,5 @@ -# $NetBSD: Makefile,v 1.3 1999/03/26 08:34:36 ender Exp $ +# $NetBSD: Makefile,v 1.4 1999/12/17 20:48:06 fredb Exp $ -SUBDIR= instkernel miniroot +SUBDIR= instkernel # miniroot .include diff --git a/distrib/mac68k/instkernel/Makefile b/distrib/mac68k/instkernel/Makefile index 87692fb5a716..976173e1b816 100644 --- a/distrib/mac68k/instkernel/Makefile +++ b/distrib/mac68k/instkernel/Makefile @@ -1,5 +1,7 @@ -# $NetBSD: Makefile,v 1.1 1999/03/26 08:34:37 ender Exp $ +# $NetBSD: Makefile,v 1.2 1999/12/17 20:48:07 fredb Exp $ SUBDIR= ramdisk instkernel +TARGETS+= release + .include diff --git a/distrib/mac68k/instkernel/instkernel/Makefile b/distrib/mac68k/instkernel/instkernel/Makefile index f6710b476054..483d04de202c 100644 --- a/distrib/mac68k/instkernel/instkernel/Makefile +++ b/distrib/mac68k/instkernel/instkernel/Makefile @@ -1,19 +1,29 @@ -# $NetBSD: Makefile,v 1.1 1999/03/26 08:34:37 ender Exp $ +# $NetBSD: Makefile,v 1.2 1999/12/17 20:48:08 fredb Exp $ RAMDISK!=cd ${.CURDIR}/../ramdisk; \ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/ramdisk.fs\n" | \ ${MAKE} -s -f- -KERNEL=${BSDSRCDIR}/sys/arch/mac68k/compile/INSTALL/netbsd +INSTALL_KERNEL?=INSTALL +KERNEL=${BSDSRCDIR}/sys/arch/mac68k/compile/${INSTALL_KERNEL}/netbsd all: - cp ${KERNEL} netbsd - mdsetimage -T 0x0 -v netbsd ${RAMDISK} - strip netbsd - gzip -f netbsd + cp ${KERNEL} netbsd-${INSTALL_KERNEL} + mdsetimage -T 0x0 -v netbsd-${INSTALL_KERNEL} ${RAMDISK} +# XXX Doesn't boot with this. Why? +# strip netbsd-${INSTALL_KERNEL} +# XXX Reported not to boot on some machines. +# gzip -9 -f netbsd-${INSTALL_KERNEL} + gzip -f netbsd-${INSTALL_KERNEL} clean cleandir distclean: - rm -f netbsd + rm -f netbsd* + +release: all + ${INSTALL} -d -o root -g wheel -m 755 \ + ${RELEASEDIR}/installation/instkernel/ + ${INSTALL} -c -o root -g wheel -m 644 netbsd-${INSTALL_KERNEL}.gz \ + ${RELEASEDIR}/installation/instkernel/ .include .include diff --git a/distrib/mac68k/instkernel/ramdisk/Makefile b/distrib/mac68k/instkernel/ramdisk/Makefile index e855711383f3..db650a6ee469 100644 --- a/distrib/mac68k/instkernel/ramdisk/Makefile +++ b/distrib/mac68k/instkernel/ramdisk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1999/05/11 20:46:59 veego Exp $ +# $NetBSD: Makefile,v 1.3 1999/12/17 20:48:08 fredb Exp $ TOP= ${.CURDIR}/.. @@ -20,7 +20,7 @@ LISTS= list CRUNCHCONF= ${CBIN}.conf MTREE= mtree.conf -all: ${CBIN} +all: notes ${CBIN} dd if=/dev/zero of=${IMAGE} count=5120 vnconfig -v -c ${VND_CDEV} ${IMAGE} # disklabel -rw ${VND_CDEV} ${DISKTYPE} @@ -40,6 +40,11 @@ unconfig: -vnconfig -u ${VND_DEV} -/bin/rm -f ${IMAGE} +notes: + cd ${.CURDIR}/../../../notes/mac68k && ${MAKE} && \ + cp ${.OBJDIR}/../../../notes/mac68k${__usrobjdirpf}/INSTALL.more \ + ${.OBJDIR}/ + ${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} @@ -47,7 +52,10 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c make -f ${CBIN}.mk all clean cleandir distclean: - /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.cro *.c + /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ + *.o *.cro *.c INSTALL.more + +.INTERRUPT: unconfig .include .include diff --git a/distrib/mac68k/instkernel/ramdisk/list b/distrib/mac68k/instkernel/ramdisk/list index ad7ef0dc7dbc..fc9827d55080 100644 --- a/distrib/mac68k/instkernel/ramdisk/list +++ b/distrib/mac68k/instkernel/ramdisk/list @@ -1,4 +1,4 @@ -# $NetBSD: list,v 1.4 1999/11/23 23:16:04 simonb Exp $ +# $NetBSD: list,v 1.5 1999/12/17 20:48:09 fredb Exp $ # copy the crunched binary, link to it, and kill it COPY ${OBJDIR}/ramdiskbin ramdiskbin @@ -86,7 +86,7 @@ COPY ${CURDIR}/dot.profile .profile COPY ${CURDIR}/dot.hdprofile tmp/.hdprofile # and a copy of the INSTALL notes -COPY ${CURDIR}/../../../notes/mac68k/INSTALL.more INSTALL.more +COPY ${OBJDIR}/INSTALL.more INSTALL.more #the lists of obsolete files used by sysinst SPECIAL sh ${CURDIR}/../../../../distrib/sets/makeobsolete -b -s ${CURDIR}/../../../../distrib/sets -t ./dist