Wed Dec 2 17:56:14 2009 UTC ()
Oops.  Remove debug echo again.


(uebayasi)
diff -r1.100 -r1.101 src/distrib/sets/sets.subr

cvs diff -r1.100 -r1.101 src/distrib/sets/sets.subr (expand / switch to unified diff)

--- src/distrib/sets/sets.subr 2009/12/02 17:51:30 1.100
+++ src/distrib/sets/sets.subr 2009/12/02 17:56:14 1.101
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: sets.subr,v 1.100 2009/12/02 17:51:30 uebayasi Exp $ 1# $NetBSD: sets.subr,v 1.101 2009/12/02 17:56:14 uebayasi Exp $
2# 2#
3 3
4# 4#
5# The following variables contain defaults for sets.subr functions and callers: 5# The following variables contain defaults for sets.subr functions and callers:
6# setsdir path to src/distrib/sets 6# setsdir path to src/distrib/sets
7# nlists list of base sets 7# nlists list of base sets
8# xlists list of x11 sets 8# xlists list of x11 sets
9# extlists list of extsrc sets 9# extlists list of extsrc sets
10# obsolete controls if obsolete files are selected instead 10# obsolete controls if obsolete files are selected instead
11# module if != "no", enable MODULE sets 11# module if != "no", enable MODULE sets
12# shlib shared library format (a.out, elf, or "") 12# shlib shared library format (a.out, elf, or "")
13# stlib static library format (a.out, elf) 13# stlib static library format (a.out, elf)
14# 14#
@@ -157,27 +157,27 @@ MKX11:=no @@ -157,27 +157,27 @@ MKX11:=no
157. else 157. else
158MKXORG:=no 158MKXORG:=no
159. endif 159. endif
160.endif 160.endif
161all: 161all:
162.for i in MACHINE MACHINE_ARCH MACHINE_CPU \ 162.for i in MACHINE MACHINE_ARCH MACHINE_CPU \
163 HAVE_BINUTILS HAVE_GCC HAVE_GDB OBJECT_FMT TOOLCHAIN_MISSING \ 163 HAVE_BINUTILS HAVE_GCC HAVE_GDB OBJECT_FMT TOOLCHAIN_MISSING \
164 ${MKEXTRAVARS} ${_MKVARS_yes} ${_MKVARS_no} 164 ${MKEXTRAVARS} ${_MKVARS_yes} ${_MKVARS_no}
165 @echo "export \$i=\"\${\$i}\"" 165 @echo "export \$i=\"\${\$i}\""
166.endfor 166.endfor
167 167
168EOMAKE 168EOMAKE
169); do 169); do
170 echo 1>&2 "DEBUG: read $x" 170# echo 1>&2 "DEBUG: read $x"
171 eval $x 171 eval $x
172done 172done
173 173
174IFS=$oIFS 174IFS=$oIFS
175 175
176MKVARS="$MKEXTRAVARS $_MKVARS_yes $_MKVARS_no" 176MKVARS="$MKEXTRAVARS $_MKVARS_yes $_MKVARS_no"
177 177
178setsdir=${0%/*} 178setsdir=${0%/*}
179obsolete=0 179obsolete=0
180module=yes 180module=yes
181if [ "${MKKMOD}" = "no" ]; then 181if [ "${MKKMOD}" = "no" ]; then
182 module=no # MODULEs are off. 182 module=no # MODULEs are off.
183elif [ "${MACHINE}" = "evbppc" ]; then 183elif [ "${MACHINE}" = "evbppc" ]; then
@@ -208,27 +208,27 @@ extlists="extbase extcomp extetc" @@ -208,27 +208,27 @@ extlists="extbase extcomp extetc"
208OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh` 208OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh`
209MODULEDIR="stand/${MACHINE}/${OSRELEASE}/modules" 209MODULEDIR="stand/${MACHINE}/${OSRELEASE}/modules"
210SUBST="s#@MODULEDIR@#${MODULEDIR}#g" 210SUBST="s#@MODULEDIR@#${MODULEDIR}#g"
211SUBST="${SUBST};s#@OSRELEASE@#${OSRELEASE}#g" 211SUBST="${SUBST};s#@OSRELEASE@#${OSRELEASE}#g"
212SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g" 212SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g"
213 213
214# 214#
215# list_set_files setfile [...] 215# list_set_files setfile [...]
216#  216#
217# Produce a packing list for setfile(s). 217# Produce a packing list for setfile(s).
218# In each file, a record consists of a path and a System Package name, 218# In each file, a record consists of a path and a System Package name,
219# separated by whitespace. E.g., 219# separated by whitespace. E.g.,
220# 220#
221# # $NetBSD: sets.subr,v 1.100 2009/12/02 17:51:30 uebayasi Exp $ 221# # $NetBSD: sets.subr,v 1.101 2009/12/02 17:56:14 uebayasi Exp $
222# . base-sys-root [keyword[,...]] 222# . base-sys-root [keyword[,...]]
223# ./altroot base-sys-root 223# ./altroot base-sys-root
224# ./bin base-sys-root 224# ./bin base-sys-root
225# ./bin/[ base-util-root 225# ./bin/[ base-util-root
226# ./bin/cat base-util-root 226# ./bin/cat base-util-root
227# [...] 227# [...]
228# 228#
229# A # in the first column marks a comment. 229# A # in the first column marks a comment.
230# 230#
231# If ${obsolete} != 0, only entries with an "obsolete" keyword will 231# If ${obsolete} != 0, only entries with an "obsolete" keyword will
232# be printed. All other keywords must be present. 232# be printed. All other keywords must be present.
233# 233#
234# The third field is an optional comma separated list of keywords to 234# The third field is an optional comma separated list of keywords to