diff options
author | julian <julian@FreeBSD.org> | 1996-08-22 09:45:46 +0000 |
---|---|---|
committer | julian <julian@FreeBSD.org> | 1996-08-22 09:45:46 +0000 |
commit | c5deb4e0829157e2bf2ee5c630e445b06f74f3bf (patch) | |
tree | 8374498f50ea58758f70fa4a9b9a1d6772989223 /release/floppies | |
parent | 2e80ac2e7889b8be73c526417fc8c5883d5f3eb1 (diff) | |
download | FreeBSD-src-c5deb4e0829157e2bf2ee5c630e445b06f74f3bf.zip FreeBSD-src-c5deb4e0829157e2bf2ee5c630e445b06f74f3bf.tar.gz |
slight cleanup of the floppy building stuff to take into account
the new OBJdir system.
quite a bit to go yet.
cd /usr/src; make world
cd release
cd sysinstall;make obj; cd ..
cd floppies; make obj; make
Diffstat (limited to 'release/floppies')
-rw-r--r-- | release/floppies/Makefile | 6 | ||||
-rw-r--r-- | release/floppies/boot/crunch/Makefile | 13 | ||||
-rw-r--r-- | release/floppies/boot/floppy/Makefile | 12 | ||||
-rw-r--r-- | release/floppies/boot/mfs/Makefile | 3 | ||||
-rw-r--r-- | release/floppies/crunch_fs.mk | 8 | ||||
-rw-r--r-- | release/floppies/fixit/crunch/Makefile | 1 | ||||
-rw-r--r-- | release/floppies/makecrunch.mk | 12 |
7 files changed, 29 insertions, 26 deletions
diff --git a/release/floppies/Makefile b/release/floppies/Makefile index 1e929d6..2e4bb21 100644 --- a/release/floppies/Makefile +++ b/release/floppies/Makefile @@ -1,13 +1,9 @@ -# $Id: Makefile,v 1.1 1996/05/21 01:12:20 julian Exp $ +# $Id: Makefile,v 1.2 1996/05/29 01:35:18 jkh Exp $ # SUBDIR= boot fixit PROG=write_mfs_in_kernel NOMAN=yes -#write_mfs_in_kernel: ${.CURDIR}/write_mfs_in_kernel.c -# ${CC} ${CFLAGS} -o write_mfs_in_kernel ${.CURDIR}/write_mfs_in_kernel.c - - .include <bsd.prog.mk> diff --git a/release/floppies/boot/crunch/Makefile b/release/floppies/boot/crunch/Makefile index b48f9b7..b339e18 100644 --- a/release/floppies/boot/crunch/Makefile +++ b/release/floppies/boot/crunch/Makefile @@ -1,2 +1,15 @@ +OBJTOP=../../../.. +SYSINSTALL= ${OBJTOP}/release/sysinstall/sysinstall + +all: ${SYSINSTALL} + +${SYSINSTALL}: + cd ${.CURDIR}/../../../../release/sysinstall ; make + @if ! test -f ${SYSINSTALL} ; then \ + ${ECHO} "sysinstall not made" ; \ + ${ECHO} "Possibly need to 'make obj' for floppies and sysinstall" ; \ + exit 1; \ + fi + .include "../../makecrunch.mk" diff --git a/release/floppies/boot/floppy/Makefile b/release/floppies/boot/floppy/Makefile index b6986ab..eddf268 100644 --- a/release/floppies/boot/floppy/Makefile +++ b/release/floppies/boot/floppy/Makefile @@ -1,5 +1,5 @@ -# $Id: Makefile,v 1.1 1996/05/21 01:12:35 julian Exp $ +# $Id: Makefile,v 1.2 1996/06/24 04:23:34 jkh Exp $ # If this is a RELEASE, then set # Things which without too much trouble can be considered variables @@ -55,9 +55,11 @@ all: ${FS_BIN}/write_mfs_in_kernel # We don't erase the sys/compile/${KERNEL} directory, since somebody # may want to reuse it (release.8 presently) # +CONF=${TOP}/sys/i386/conf +COMPILE=${TOP}/sys/compile doKERNEL: - cd ${TOP}/sys/i386/conf && config -n ${KERNEL} - cd ${OBJTOP}/sys/compile/${KERNEL} && \ + cd ${CONF} && config -n ${KERNEL} + cd ${COMPILE}/${KERNEL} && \ make depend && \ make kernel && \ @@ -65,10 +67,8 @@ doKERNEL: # --==## Put a filesystem into a BOOTMFS kernel ##==-- # LABELDIR=${OBJTOP}/sys/i386/boot/biosboot -CONF=${TOP}/sys/i386/conf -COMPILE=${OBJTOP}/sys/compile doMFSKERN: - rm -f ${OBJTOP}/sys/compile/BOOTMFS/mfs_vfsops.o + rm -f ${COMPILE}/BOOTMFS/mfs_vfsops.o cd ${CONF} && \ fgrep -v SYSV GENERIC | \ fgrep -v pty | \ diff --git a/release/floppies/boot/mfs/Makefile b/release/floppies/boot/mfs/Makefile index 2329d98..e7981b3 100644 --- a/release/floppies/boot/mfs/Makefile +++ b/release/floppies/boot/mfs/Makefile @@ -1,9 +1,10 @@ ### -# $Id: Makefile,v 1.214 1996/05/02 08:18:28 jkh Exp $ +# $Id: Makefile,v 1.1 1996/05/21 01:12:36 julian Exp $ # # What are we if we weren't told.. CRUNCH?= mfs CRUNCHDIRS= ../crunch +OBJTOP=../../../.. TOP=${.CURDIR}/../../../.. FS_BIN=${.CURDIR}/../.. FSLABEL=minimum diff --git a/release/floppies/crunch_fs.mk b/release/floppies/crunch_fs.mk index ab11d5a..7471389 100644 --- a/release/floppies/crunch_fs.mk +++ b/release/floppies/crunch_fs.mk @@ -1,5 +1,5 @@ ### -# $Id: Makefile,v 1.214 1996/05/02 08:18:28 jkh Exp $ +# $Id: crunch_fs.mk,v 1.1 1996/05/21 01:12:21 julian Exp $ # # This is included to make a floppy that includes a crunch file # @@ -34,7 +34,7 @@ ZIP?=true # Things which will get you into trouble if you change them TREE= tree -LABELDIR= ${TOP}/sys/i386/boot/biosboot/obj +LABELDIR= ${OBJTOP}/sys/i386/boot/biosboot clean: rm -rf tree fs-image fs-image.size step[0-9] @@ -57,7 +57,7 @@ ${TREE}: ${.CURDIR}/Makefile ln -s /stand $${i} ; \ done -step2: ${CRUNCHDIRS} ${.CURDIR}/Makefile +step2: ${.CURDIR}/${CRUNCHDIRS} ${.CURDIR}/Makefile .if defined(CRUNCHDIRS) @cd ${.CURDIR} && $(MAKE) installCRUNCH DIR=${TREE}/stand ZIP=${ZIP} .endif @@ -73,7 +73,7 @@ step3: step2 step4: step3 .if defined(VERBATIM) A=`pwd`;cd ${.CURDIR}/${VERBATIM}; \ - find . -print |cpio -pdmuv $$A/tree + find . \! \( -name CVS -and -prune \) -print |cpio -pdmuv $$A/tree .endif true || cp ${TOP}/etc/spwd.db tree/etc touch step4 diff --git a/release/floppies/fixit/crunch/Makefile b/release/floppies/fixit/crunch/Makefile index b48f9b7..13b0860 100644 --- a/release/floppies/fixit/crunch/Makefile +++ b/release/floppies/fixit/crunch/Makefile @@ -1,2 +1,3 @@ +OBJTOP=../../../.. .include "../../makecrunch.mk" diff --git a/release/floppies/makecrunch.mk b/release/floppies/makecrunch.mk index a7f2077..8f2d3e7 100644 --- a/release/floppies/makecrunch.mk +++ b/release/floppies/makecrunch.mk @@ -1,18 +1,10 @@ -.if exists(../../../../release/sysinstall/sysinstall) -SYSINSTALL= ../../../../release/sysinstall/sysinstall -.else -SYSINSTALL= ../../../../release/sysinstall/obj/sysinstall -.endif +SYSINSTALL= ${OBJTOP}/release/sysinstall/sysinstall NOCRYPT?= yes -all: ${SYSINSTALL} crunch - -${SYSINSTALL}: - @echo "you need to make sysinstall first" - false +all: crunch crunch: -crunchgen ${.CURDIR}/crunch.conf |