Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add -h' and -y' to `Usage' (which were missing there);

Browse Source 
synchronize the options list from `Usage' with its own summary,
 and re-outline that list;
two corrections in the order of the options in (parseoptions) list;
a small punctuation change;
remove trailing whitespace in one line.

From Snader_LB.
This commit is contained in:
wiz 2011-08-15 14:48:00 +00:00
parent 00d8bbccfa
commit 281ac0460b
1 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
build.sh
View File

@ -1,5 +1,5 @@
#! /usr/bin/env sh
# $NetBSD: build.sh,v 1.245 2011/08/08 22:15:42 jmcneill Exp $
# $NetBSD: build.sh,v 1.246 2011/08/15 14:48:00 wiz Exp $
#
# Copyright (c) 2001-2009 The NetBSD Foundation, Inc.
# All rights reserved.
@ -596,7 +596,7 @@ usage()
fi
cat <<_usage_
Usage: ${progname} [-EnorUux] [-a arch] [-B buildid] [-C cdextras]
Usage: ${progname} [-EhnorUuxy] [-a arch] [-B buildid] [-C cdextras]
[-D dest] [-j njob] [-M obj] [-m mach] [-N noisy]
[-O obj] [-R release] [-S seed] [-T tools]
[-V var=[value]] [-w wrapper] [-X x11src] [-Y extsrcsrc]
@ -635,7 +635,7 @@ Usage: ${progname} [-EnorUux] [-a arch] [-B buildid] [-C cdextras]
Options:
-a arch Set MACHINE_ARCH to arch. [Default: deduced from MACHINE]
-B buildId Set BUILDID to buildId.
-B buildid Set BUILDID to buildid.
-C cdextras Append cdextras to CDEXTRA variable for inclusion on CD-ROM.
-D dest Set DESTDIR to dest. [Default: destdir.MACHINE]
-E Set "expert" mode; disables various safety checks.
@ -660,20 +660,20 @@ Usage: ${progname} [-EnorUux] [-a arch] [-B buildid] [-C cdextras]
-r Remove contents of TOOLDIR and DESTDIR before building.
-S seed Set BUILDSEED to seed. [Default: NetBSD-majorversion]
-T tools Set TOOLDIR to tools. If unset, and TOOLDIR is not set in
the environment, ${toolprefix}make will be (re)built unconditionally.
the environment, ${toolprefix}make will be (re)built
unconditionally.
-U Set MKUNPRIVED=yes; build without requiring root privileges,
install from an UNPRIVED build with proper file permissions.
-u Set MKUPDATE=yes; do not run "make cleandir" first.
Without this, everything is rebuilt, including the tools.
-V v=[val] Set variable \`v' to \`val'.
-V var=[value] Set variable \`var' to \`value'.
-w wrapper Create ${toolprefix}make script as wrapper.
[Default: \${TOOLDIR}/bin/${toolprefix}make-\${MACHINE}]
-X x11src Set X11SRCDIR to x11src. [Default: /usr/xsrc]
-x Set MKX11=yes; build X11 from X11SRCDIR
-Y extsrcsrc
Set EXTSRCSRCDIR to extsrcsrc. [Default: /usr/extsrc]
-Y extsrcsrc Set EXTSRCSRCDIR to extsrcsrc. [Default: /usr/extsrc]
-y Set MKEXTSRC=yes; build extsrc from EXTSRCSRCDIR
-Z v Unset ("zap") variable \`v'.
-Z var Unset ("zap") variable \`var'.
_usage_
exit 1
@ -681,7 +681,7 @@ _usage_
parseoptions()
{
opts='a:B:C:D:Ehj:M:m:N:nO:oR:rS:T:UuV:w:xX:yY:Z:'
opts='a:B:C:D:Ehj:M:m:N:nO:oR:rS:T:UuV:w:X:xY:yZ:'
opt_a=no
if type getopts >/dev/null 2>&1; then
@ -1387,7 +1387,7 @@ createmakewrapper()
eval cat <<EOF ${makewrapout}
#! ${HOST_SH}
# Set proper variables to allow easy "make" building of a NetBSD subtree.
# Generated from: \$NetBSD: build.sh,v 1.245 2011/08/08 22:15:42 jmcneill Exp $
# Generated from: \$NetBSD: build.sh,v 1.246 2011/08/15 14:48:00 wiz Exp $
# with these arguments: ${_args}
#
@ -1577,7 +1577,7 @@ installworld()
# We test that rump links with a number of component configurations.
# These attempt to mimic what is encountered in the full build.
# See list below. The list should probably be either autogenerated
# or managed elsewhere. But keep it here until a better idea arises.
# or managed elsewhere; keep it here until a better idea arises.
#
# Above all, note that THIS IS NOT A SUBSTITUTE FOR A FULL BUILD.
#