YAMFC:

. remove ${RELEASEDIR}
. add scsi_modes to fixit

Not from -current:

. bump RELNAME to "2.2-RELEASE", so we don't forget about this (it was
  still at GAMMA which was quite somewhat out of date)

2 files changed, 15 insertions, 27 deletions

diff --git a/release/Makefile b/release/Makefile
index 582a5b14e25f..bd52127488bf 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.246.2.22 1997/02/05 04:36:41 jkh Exp $
+#	$Id: Makefile,v 1.246.2.23 1997/02/23 15:53:25 joerg Exp $
 #
 # How to roll a release:
 #
@@ -14,7 +14,7 @@
 # otherwise the target 'release.8' and possibly others will fail.
 #
 # SET THIS !!!
-BUILDNAME=2.2-BETA
+BUILDNAME=2.2-RELEASE
 #CHROOTDIR=/junk/release
 # If this is a RELEASE, then set
 RELEASETAG=RELENG_2_2
@@ -53,9 +53,9 @@ BOOTINODE=		100000
 # Things which will get you into trouble if you change them
 DISTRIBUTIONS=		bin ${EXTRA_DISTS}
 MTREEFILES=		${.CURDIR}/../etc/mtree
-RD=			${RELEASEDIR}/stage
-FD=			${RELEASEDIR}/ftp
-CD=			${RELEASEDIR}/cdrom
+RD=			/R/stage
+FD=			/R/ftp
+CD=			/R/cdrom
 
 .if !defined(WHICH_CRUNCH)
 WHICH_CRUNCH=	boot fixit
@@ -124,8 +124,6 @@ rerelease release:
 	echo "set -ex"				>> ${CHROOTDIR}/mk
 	echo "CFLAGS='-O2 -pipe'"		>> ${CHROOTDIR}/mk
 	echo "export CFLAGS"			>> ${CHROOTDIR}/mk
-	echo "RELEASEDIR=/R"			>> ${CHROOTDIR}/mk
-	echo "export RELEASEDIR"		>> ${CHROOTDIR}/mk
 	echo "cd /usr/src"			>> ${CHROOTDIR}/mk
 .if make(release)
 	echo "make world"			>> ${CHROOTDIR}/mk
@@ -151,12 +149,11 @@ whap:
 clean:
 	rm -rf boot_crunch release.[0-9] release.1[0]
 
-# Clean out ${RELEASEDIR} and make the directory structure.
+# Clean out /R and make the directory structure.
 release.1:
-	@cd ${.CURDIR} && $(MAKE) ckRELEASEDIR
-	-mkdir ${RELEASEDIR}
-	chflags -R noschg ${RELEASEDIR}/.
-	rm -rf ${RELEASEDIR}/*
+	-mkdir /R
+	chflags -R noschg /R/.
+	rm -rf /R/*
 	mkdir ${RD}
 	mkdir ${RD}/floppies
 	mkdir ${RD}/trees
@@ -178,7 +175,6 @@ release.1:
 
 # Install the system into the various distributions.
 release.2:
-	@cd ${.CURDIR} && $(MAKE) ckRELEASEDIR
 	cd ${.CURDIR}/../etc && make distrib-dirs DESTDIR=${RD}/trees/bin
 	cd ${.CURDIR}/.. && make distribute DISTDIR=${RD}/trees
 .if exists(${.CURDIR}/../eBones)
@@ -193,7 +189,6 @@ release.2:
 
 # Make and install the generic kernel(s).
 release.3:
-	@cd ${.CURDIR} && $(MAKE) ckRELEASEDIR
 .for kernel in ${KERNELS}
 	rm -f ${RD}/kernels/${kernel}
 	rm -rf ${.CURDIR}/../sys/compile/${kernel}
@@ -209,7 +204,6 @@ release.3:
 # NB: the "RELEASE_BUILD_FIXIT" magic prevents vi from including the
 # Tcl and Perl APIs.  See also /usr/src/usr.bin/vi/Makefile.
 release.4:
-	@cd ${.CURDIR} && $(MAKE) ckRELEASEDIR
 	cd ${.CURDIR}/sysinstall && make depend all
 	rm -rf ${RD}/crunch
 	mkdir -p ${RD}/crunch
@@ -230,7 +224,6 @@ release.4:
 # --==## Fix up the distributions. ##==--
 #
 release.5:
-	@cd ${.CURDIR} && $(MAKE) ckRELEASEDIR
 	# Handle some grief caused by the munition braindeadness.
 	for i in sbin/init bin/ed ; do \
 		( cd ${.CURDIR}/../$$i; \
@@ -311,7 +304,6 @@ release.5:
 # --==## Make binary dists ##==--
 #
 release.6:
-	@cd ${.CURDIR} && $(MAKE) ckRELEASEDIR
 	rm -rf ${RD}/dists
 	mkdir -p ${RD}/dists
 	@for i in ${DISTRIBUTIONS} ; \
@@ -332,7 +324,6 @@ release.6:
 # --==## Make source dists ##==--
 #
 release.7:
-	@cd ${.CURDIR} && $(MAKE) ckRELEASEDIR
 	@cd ${.CURDIR} && $(MAKE) doTARBALL SD=/usr/src \
 		TD=src TN=sbase ARG="[A-Z]*"
 	@for i in `cd /usr/src && echo [a-z]*` ; do \
@@ -375,7 +366,6 @@ release.7:
 #
 
 release.8: write_mfs_in_kernel dumpnlist
-	@cd ${.CURDIR} && $(MAKE) ckRELEASEDIR
 	rm -rf ${RD}/mfsfd
 	mkdir ${RD}/mfsfd
 	cd ${RD}/mfsfd && \
@@ -414,11 +404,11 @@ release.8: write_mfs_in_kernel dumpnlist
 # --==## Create a fixit floppy ##==--
 #
 release.9:
-	@cd ${.CURDIR} && $(MAKE) ckRELEASEDIR
 	rm -rf ${RD}/fixitfd
 	mkdir ${RD}/fixitfd
 	cd ${RD}/fixitfd && \
-		mkdir dev stand bin sbin etc mnt mnt1 mnt2 mnt3 mnt4 tmp
+		mkdir -p dev stand bin sbin etc mnt mnt1 mnt2 mnt3 mnt4 tmp \
+		usr/share/misc
 	@cd ${.CURDIR} && $(MAKE) installCRUNCH CRUNCH=fixit \
 		DIR=${RD}/fixitfd/stand ZIP=false
 	( cd ${RD}/fixitfd/dev && \
@@ -427,6 +417,8 @@ release.9:
 		sh MAKEDEV all )
 	cp ${RD}/trees/bin/etc/spwd.db ${RD}/trees/bin/etc/group \
 		${RD}/trees/bin/etc/protocols ${RD}/fixitfd/etc
+	cp ${RD}/trees/bin/usr/share/misc/scsi_modes \
+		${RD}/fixitfd/usr/share/misc
 	cp ${.CURDIR}/fixit.profile ${RD}/fixitfd/.profile
 	cp ${.CURDIR}/fixit.services ${RD}/fixitfd/etc/services
 	cp ${.CURDIR}/tar.sh ${RD}/fixitfd/stand/tar
@@ -535,11 +527,6 @@ write_mfs_in_kernel:	${.CURDIR}/write_mfs_in_kernel.c
 dumpnlist:	${.CURDIR}/dumpnlist.c
 	${CC} ${CFLAGS} -o dumpnlist ${.CURDIR}/dumpnlist.c
 
-ckRELEASEDIR:
-.if !defined(RELEASEDIR)
-	@echo "To make a release RELEASEDIR must be defined" && false
-.endif
-
 installCRUNCH:
 .if !defined(CRUNCH)
 	@echo "CRUNCH undefined in installCRUNCH" && exit 1
diff --git a/release/fixit.profile b/release/fixit.profile
index 940368cc7435..863f68548b46 100644
--- a/release/fixit.profile
+++ b/release/fixit.profile
@@ -1,10 +1,11 @@
 :
-# $Id: fixit.profile,v 1.1.6.1 1996/11/09 16:33:53 joerg Exp $
+# $Id: fixit.profile,v 1.1.6.2 1996/11/28 08:58:25 joerg Exp $
 
 export BLOCKSIZE=K
 export PS1="Fixit# "
 export EDITOR="/mnt2/stand/vi"
 export PAGER="/mnt2/stand/more"
+export SCSI_MODES="/mnt2/usr/share/misc/scsi_modes"
 # the root MFS doesn't have /dev/nrst0, pick a better default for mt(1)
 export TAPE=/mnt2/dev/nrst0