[src/trunk]: src Pass down INSTALLSETS variable to installsets target. Use :Q...

[jym <jym%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ae206b07810c
branches:  trunk
changeset: 761486:ae206b07810c
user:      jym <jym%NetBSD.org@localhost>
date:      Sat Jan 29 16:56:26 2011 +0000

description:
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.

diffstat:

 BUILDING |  10 ++++++----
 Makefile |   4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (45 lines):

diff -r ade38583e429 -r ae206b07810c BUILDING
--- a/BUILDING  Sat Jan 29 14:20:18 2011 +0000
+++ b/BUILDING  Sat Jan 29 16:56:26 2011 +0000
@@ -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
diff -r ade38583e429 -r ae206b07810c Makefile
--- a/Makefile  Sat Jan 29 14:20:18 2011 +0000
+++ b/Makefile  Sat Jan 29 16:56:26 2011 +0000
@@ -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