Module Name: src
Committed By: riz
Date: Tue Mar 8 17:47:59 UTC 2011
Modified Files:
src [netbsd-5]: BUILDING Makefile
Log Message:
Pull up following revision(s) (requested by jym in ticket #1565):
Makefile: revision 1.282 via patch
BUILDING: revision 1.92 via patch
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.78.2.3 -r1.78.2.4 src/BUILDING
cvs rdiff -u -r1.262.2.4 -r1.262.2.5 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.78.2.3 src/BUILDING:1.78.2.4
--- src/BUILDING:1.78.2.3 Mon May 11 19:40:22 2009
+++ src/BUILDING Tue Mar 8 17:47:59 2011
@@ -521,9 +521,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
@@ -657,7 +658,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.262.2.4 src/Makefile:1.262.2.5
--- src/Makefile:1.262.2.4 Thu Jan 6 05:19:54 2011
+++ src/Makefile Tue Mar 8 17:47:59 2011
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.262.2.4 2011/01/06 05:19:54 riz Exp $
+# $NetBSD: Makefile,v 1.262.2.5 2011/03/08 17:47:59 riz Exp $
#
# This is the top-level makefile for building NetBSD. For an outline of
@@ -320,7 +320,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
