Module Name: src
Committed By: jym
Date: Sat Jan 29 16:56:27 UTC 2011
Modified Files:
src: BUILDING Makefile
Log Message:
Pass down INSTALLSETS variable to installsets target. Use :Q to escape
shell meta-characters, as the variable contains a list of sets, separated
by spaces.
$ ./build.sh -V INSTALLSETS="base etc" install=idir
should now work as expected.
Reviewed by apb@ on tech-toolchain.
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/BUILDING
cvs rdiff -u -r1.281 -r1.282 src/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/BUILDING
diff -u src/BUILDING:1.91 src/BUILDING:1.92
--- src/BUILDING:1.91 Sun Jul 25 07:19:00 2010
+++ src/BUILDING Sat Jan 29 16:56:26 2011
@@ -529,9 +529,10 @@
ing.
The INSTALLSETS environment variable may be set to a list
- of distribution sets to be installed. By default, all sets
- except ``etc'' and ``xetc'' are installed, so most files in
- INSTALLWORLDDIR/etc will not be installed or modified.
+ of distribution sets to be installed, separated by spaces.
+ By default, all sets except ``etc'' and ``xetc'' are
+ extracted, so most files in INSTALLWORLDDIR/etc will not
+ be installed or modified.
Note: Before performing this operation with
INSTALLWORLDDIR=/, it is highly recommended that you
@@ -665,7 +666,8 @@
install=idir Install the contents of DESTDIR to idir, using ``make
installworld''. Note that files that are part of the
- ``etc'' or ``xetc'' sets will not be installed.
+ ``etc'' or ``xetc'' sets will not be installed, unless
+ overridden by the INSTALLSETS environment variable.
kernel=kconf Build a new kernel. The kconf argument is the name of a
configuration file suitable for use by config(1). If kconf
Index: src/Makefile
diff -u src/Makefile:1.281 src/Makefile:1.282
--- src/Makefile:1.281 Fri Dec 3 21:38:46 2010
+++ src/Makefile Sat Jan 29 16:56:26 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.281 2010/12/03 21:38:46 plunky Exp $
+# $NetBSD: Makefile,v 1.282 2011/01/29 16:56:26 jym Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -332,7 +332,7 @@
.endif
.endif
${MAKEDIRTARGET} distrib/sets installsets \
- INSTALLDIR=${INSTALLWORLDDIR:U/} INSTALLSETS=
+ INSTALLDIR=${INSTALLWORLDDIR:U/} INSTALLSETS=${INSTALLSETS:Q}
${MAKEDIRTARGET} . postinstall-check DESTDIR=${INSTALLWORLDDIR}
@echo "make ${.TARGET} started at: ${START_TIME}"
@printf "make ${.TARGET} finished at: " && date
