From b08050d67a501917e464927048c4a4fbf05a7956 Mon Sep 17 00:00:00 2001 From: lukem Date: Tue, 18 Mar 2008 04:24:38 +0000 Subject: [PATCH] Consistently document RELEASEDIR/RELEASEMACHINEDIR. --- BUILDING | 41 +++++++++++++++++++++-------------------- Makefile | 10 ++++++---- doc/BUILDING.mdoc | 16 ++++++++-------- 3 files changed, 35 insertions(+), 32 deletions(-) diff --git a/BUILDING b/BUILDING index a6706394dd77..fa7671878443 100644 --- a/BUILDING +++ b/BUILDING @@ -485,17 +485,17 @@ BUILDING to fix them). sets Create distribution sets from DESTDIR into - RELEASEDIR/MACHINE/binary/sets. Should be run after ``make - distribution'' (as ``make build'' does not install all of - the required files). + RELEASEDIR/RELEASEMACHINEDIR/binary/sets. Should be run + after ``make distribution'' (as ``make build'' does not + install all of the required files). sourcesets Create source sets of the source tree into RELEASEDIR/source/sets. syspkgs Create syspkgs from DESTDIR into - RELEASEDIR/MACHINE/binary/syspkgs. Should be run after - ``make distribution'' (as ``make build'' does not install - all of the required files). + RELEASEDIR/RELEASEMACHINEDIR/binary/syspkgs. Should be run + after ``make distribution'' (as ``make build'' does not + install all of the required files). release Do a ``make distribution'', build kernels, distribution media, and install sets (this as per ``make sets''), and @@ -517,11 +517,11 @@ BUILDING populated by ``make release'' or equivalent. Note that other, smaller, CD-ROM images may be created in - the RELEASEDIR/MACHINE/installation/cdrom directory by - ``make release''. These smaller images usually contain the - same tools as the larger images in RELEASEDIR/iso, but do - not contain additional content such as the distribution - sets. + the RELEASEDIR/RELEASEMACHINEDIR/installation/cdrom direc- + tory by ``make release''. These smaller images usually + contain the same tools as the larger images in + RELEASEDIR/iso, but do not contain additional content such + as the distribution sets. Note that the mac68k port still uses an older method of creating CD-ROM images. This requires the mkisofs(1) util- @@ -545,11 +545,11 @@ BUILDING lent. Note that other, smaller, CD-ROM images may be created in - the RELEASEDIR/MACHINE/installation/cdrom directory by - ``make release''. These smaller images usually contain the - same tools as the larger images in RELEASEDIR/iso, but do - not contain additional content such as the distribution - sets. + the RELEASEDIR/RELEASEMACHINEDIR/installation/cdrom direc- + tory by ``make release''. These smaller images usually + contain the same tools as the larger images in + RELEASEDIR/iso, but do not contain additional content such + as the distribution sets. Note that the mac68k port still uses an older method of creating CD-ROM images. This requires the mkisofs(1) util- @@ -613,9 +613,10 @@ BUILDING releasekernel=kconf Install a gzip(1)ed copy of the kernel built by - kernel=kconf into RELEASEDIR/MACHINE/binary/kernel, usually - as netbsd-kconf.gz, although the ``netbsd'' prefix is - determined from the ``config'' directives in kconf. + kernel=kconf into + RELEASEDIR/RELEASEMACHINEDIR/binary/kernel, usually as + netbsd-kconf.gz, although the ``netbsd'' prefix is deter- + mined from the ``config'' directives in kconf. sets Perform ``make sets''. @@ -812,4 +813,4 @@ HISTORY BUGS A few platforms are not yet using this build system. -NetBSD March 8, 2008 NetBSD +NetBSD March 18, 2008 NetBSD diff --git a/Makefile b/Makefile index 75c591107aac..3b46ec5a1066 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.251 2007/11/12 15:06:45 jmmv Exp $ +# $NetBSD: Makefile,v 1.252 2008/03/18 04:24:38 lukem Exp $ # # This is the top-level makefile for building NetBSD. For an outline of @@ -51,16 +51,18 @@ # is the not root directory if cross compiling. # release: # Does a `make distribution', and then tars up the DESTDIR files -# into RELEASEDIR/${MACHINE}, in release(7) format. +# into ${RELEASEDIR}/${RELEASEMACHINEDIR}, in release(7) format. # (See etc/Makefile for more information on this.) # regression-tests: # Runs the regression tests in "regress" on this host. # sets: -# Populate ${RELEASEDIR}/${MACHINE}/binary/sets from ${DESTDIR} +# Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets +# from ${DESTDIR} # sourcesets: # Populate ${RELEASEDIR}/source/sets from ${NETBSDSRCDIR} # syspkgs: -# Populate ${RELEASEDIR}/${MACHINE}/binary/syspkgs from ${DESTDIR} +# Populate ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/syspkgs +# from ${DESTDIR} # iso-image: # Create CD-ROM image in RELEASEDIR/iso. # RELEASEDIR must already have been populated by `make release' diff --git a/doc/BUILDING.mdoc b/doc/BUILDING.mdoc index b185d3b1a7fc..2a976693d30c 100644 --- a/doc/BUILDING.mdoc +++ b/doc/BUILDING.mdoc @@ -1,6 +1,6 @@ -.\" $NetBSD: BUILDING.mdoc,v 1.55 2008/03/08 14:48:57 reed Exp $ +.\" $NetBSD: BUILDING.mdoc,v 1.56 2008/03/18 04:24:38 lukem Exp $ .\" -.\" Copyright (c) 2001-2007 The NetBSD Foundation, Inc. +.\" Copyright (c) 2001-2008 The NetBSD Foundation, Inc. .\" All rights reserved. .\" .\" This code is derived from software contributed to The NetBSD Foundation @@ -40,7 +40,7 @@ .\" Toolchain prefix for commands .ds toolprefix nb . -.Dd March 8, 2008 +.Dd March 18, 2008 .Dt BUILDING 8 .Os NetBSD . @@ -895,7 +895,7 @@ to check for inconsistencies (and possibly to fix them). Create distribution sets from .Sy DESTDIR into -.Sy RELEASEDIR/MACHINE Ns Pa /binary/sets . +.Sy RELEASEDIR/RELEASEMACHINEDIR Ns Pa /binary/sets . Should be run after .Dq make distribution (as @@ -910,7 +910,7 @@ Create source sets of the source tree into Create syspkgs from .Sy DESTDIR into -.Sy RELEASEDIR/MACHINE Ns Pa /binary/syspkgs . +.Sy RELEASEDIR/RELEASEMACHINEDIR Ns Pa /binary/syspkgs . Should be run after .Dq make distribution (as @@ -957,7 +957,7 @@ is attempted, RELEASEDIR must be populated by or equivalent. .Pp Note that other, smaller, CD-ROM images may be created in the -.Sy RELEASEDIR/MACHINE Ns Pa /installation/cdrom +.Sy RELEASEDIR/RELEASEMACHINEDIR Ns Pa /installation/cdrom directory by .Dq "make release" . These smaller images usually contain the same tools as the larger images in @@ -1001,7 +1001,7 @@ is attempted, RELEASEDIR must be populated by or equivalent. .Pp Note that other, smaller, CD-ROM images may be created in the -.Sy RELEASEDIR/MACHINE Ns Pa /installation/cdrom +.Sy RELEASEDIR/RELEASEMACHINEDIR Ns Pa /installation/cdrom directory by .Dq make release . These smaller images usually contain the same tools as the larger images in @@ -1148,7 +1148,7 @@ Install a copy of the kernel built by .Sy kernel Ns = Ns Ar kconf into -.Sy RELEASEDIR/MACHINE Ns Pa /binary/kernel , +.Sy RELEASEDIR/RELEASEMACHINEDIR Ns Pa /binary/kernel , usually as .Pa netbsd- Ns Ar kconf Ns Pa .gz , although the