* Add an "iso-image" target in the top level Makefile,
which invokes make iso-image in the etc directory. * Add an "iso-image" action in build.sh, which invokes make iso-image. * Document the above in doc/BUILDING.mdoc. * Re-generate BUILDING. Approved by christos
This commit is contained in:
apb
parent
db0d69832d
commit
21078fc390
11
BUILDING
11
BUILDING
|
|
@ -490,6 +490,13 @@ BUILDING
|
|||
described by release(7). This requires that RELEASEDIR be
|
||||
set (see above).
|
||||
|
||||
iso-image Create a CD-ROM image in
|
||||
RELEASEDIR/MACHINE/installation/cdrom. RELEASEDIR must
|
||||
already have been populated by ``make release'' or equiva-
|
||||
lent. This requires the mkisofs(1) utility, which is not
|
||||
part of NetBSD, but which can be installed from
|
||||
pkgsrc/sysutils/cdrecord.
|
||||
|
||||
regression-tests
|
||||
Can only be run after building the regression tests in the
|
||||
directory ``regress''. Runs the compiled regression tests
|
||||
|
|
@ -556,6 +563,8 @@ BUILDING
|
|||
|
||||
syspkgs Perform ``make syspkgs''.
|
||||
|
||||
iso-image Perform ``make iso-image''.
|
||||
|
||||
The following command line options alter the behaviour of the build.sh
|
||||
operations described above:
|
||||
|
||||
|
|
@ -706,7 +715,7 @@ OBSOLETE VARIABLES
|
|||
TOOLCHAIN_MISSING=yes.
|
||||
|
||||
SEE ALSO
|
||||
make(1), hier(7), release(7)
|
||||
make(1), hier(7), release(7), pkgsrc/sysutils/cdrecord
|
||||
|
||||
HISTORY
|
||||
The build.sh based build scheme was introduced for NetBSD 1.6 as
|
||||
|
|
|
|||
15
Makefile
15
Makefile
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.242 2006/01/21 19:01:15 dsl Exp $
|
||||
# $NetBSD: Makefile,v 1.243 2006/01/28 21:34:08 apb Exp $
|
||||
|
||||
#
|
||||
# This is the top-level makefile for building NetBSD. For an outline of
|
||||
|
|
@ -61,6 +61,10 @@
|
|||
# Populate ${RELEASEDIR}/source/sets from ${NETBSDSRCDIR}
|
||||
# syspkgs:
|
||||
# Populate ${RELEASEDIR}/${MACHINE}/binary/syspkgs from ${DESTDIR}
|
||||
# iso-image:
|
||||
# Create CD-ROM image in RELEASEDIR/MACHINE/installation.
|
||||
# RELEASEDIR must already have been populated by `make release'
|
||||
# or equivalent.
|
||||
#
|
||||
# Targets invoked by `make build,' in order:
|
||||
# cleandir: cleans the tree.
|
||||
|
|
@ -305,6 +309,15 @@ release snapshot: .PHONY .MAKE
|
|||
@echo "make ${.TARGET} started at: ${START_TIME}"
|
||||
@printf "make ${.TARGET} finished at: " && date
|
||||
|
||||
#
|
||||
# Create a CD-ROM image.
|
||||
#
|
||||
|
||||
iso-image: .PHONY
|
||||
${MAKEDIRTARGET} etc iso-image
|
||||
@echo "make ${.TARGET} started at: ${START_TIME}"
|
||||
@printf "make ${.TARGET} finished at: " && date
|
||||
|
||||
#
|
||||
# Special components of the "make build" process.
|
||||
#
|
||||
|
|
|
|||
6
build.sh
6
build.sh
|
|
@ -1,5 +1,5 @@
|
|||
#! /usr/bin/env sh
|
||||
# $NetBSD: build.sh,v 1.144 2006/01/08 11:03:40 dsl Exp $
|
||||
# $NetBSD: build.sh,v 1.145 2006/01/28 21:34:07 apb Exp $
|
||||
#
|
||||
# Copyright (c) 2001-2005 The NetBSD Foundation, Inc.
|
||||
# All rights reserved.
|
||||
|
|
@ -862,7 +862,7 @@ createmakewrapper()
|
|||
eval cat <<EOF ${makewrapout}
|
||||
#! /bin/sh
|
||||
# Set proper variables to allow easy "make" building of a NetBSD subtree.
|
||||
# Generated from: \$NetBSD: build.sh,v 1.144 2006/01/08 11:03:40 dsl Exp $
|
||||
# Generated from: \$NetBSD: build.sh,v 1.145 2006/01/28 21:34:07 apb Exp $
|
||||
# with these arguments: ${_args}
|
||||
#
|
||||
EOF
|
||||
|
|
@ -1035,7 +1035,7 @@ main()
|
|||
statusmsg "Successful make ${op}"
|
||||
;;
|
||||
|
||||
obj|build|distribution|release|sourcesets|syspkgs|params)
|
||||
obj|build|distribution|iso-image|release|sourcesets|syspkgs|params)
|
||||
${runcmd} "${makewrapper}" ${parallel} ${op} ||
|
||||
bomb "Failed to make ${op}"
|
||||
statusmsg "Successful make ${op}"
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.\" $NetBSD: BUILDING.mdoc,v 1.41 2006/01/12 21:22:30 wiz Exp $
|
||||
.\" $NetBSD: BUILDING.mdoc,v 1.42 2006/01/28 21:34:08 apb Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 2001-2004 The NetBSD Foundation, Inc.
|
||||
.\" All rights reserved.
|
||||
|
|
@ -901,6 +901,19 @@ This requires that
|
|||
.Sy RELEASEDIR
|
||||
be set (see above).
|
||||
.
|
||||
.It iso-image
|
||||
Create a CD-ROM image in
|
||||
.Sy RELEASEDIR/MACHINE Ns Pa /installation/cdrom .
|
||||
RELEASEDIR must already have been populated by
|
||||
.Dq make release
|
||||
or equivalent.
|
||||
This requires the
|
||||
.Xr mkisofs 1
|
||||
utility, which is not part of
|
||||
.Nx ,
|
||||
but which can be installed from
|
||||
.Pa pkgsrc/sysutils/cdrecord .
|
||||
.
|
||||
.It Sy regression-tests
|
||||
Can only be run after building the regression tests in the directory
|
||||
.Dq regress .
|
||||
|
|
@ -1049,6 +1062,10 @@ Perform
|
|||
Perform
|
||||
.Dq make syspkgs .
|
||||
.
|
||||
.It Sy iso-image
|
||||
Perform
|
||||
.Dq make iso-image .
|
||||
.
|
||||
.El
|
||||
.
|
||||
.Pp
|
||||
|
|
@ -1383,7 +1400,8 @@ To disable, use
|
|||
.Sh SEE ALSO
|
||||
.Xr make 1 ,
|
||||
.Xr hier 7 ,
|
||||
.Xr release 7
|
||||
.Xr release 7 ,
|
||||
.Pa pkgsrc/sysutils/cdrecord
|
||||
.
|
||||
.Sh HISTORY
|
||||
.
|
||||
|
|
|
|||
Loading…
Reference in New Issue