Module Name: src
Committed By: christos
Date: Fri Dec 31 16:14:44 UTC 2021
Modified Files:
src/distrib/sets: sets.subr
src/distrib/sets/lists/debug: mi
Log Message:
change CONFIG to @CONFIG@ to indicate substitution is going to happen.
To generate a diff of this commit:
cvs rdiff -u -r1.199 -r1.200 src/distrib/sets/sets.subr
cvs rdiff -u -r1.370 -r1.371 src/distrib/sets/lists/debug/mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.199 src/distrib/sets/sets.subr:1.200
--- src/distrib/sets/sets.subr:1.199 Wed Dec 29 21:30:53 2021
+++ src/distrib/sets/sets.subr Fri Dec 31 11:14:44 2021
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.199 2021/12/30 02:30:53 christos Exp $
+# $NetBSD: sets.subr,v 1.200 2021/12/31 16:14:44 christos Exp $
#
#
@@ -192,7 +192,7 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.199 2021/12/30 02:30:53 christos Exp $
+# # $NetBSD: sets.subr,v 1.200 2021/12/31 16:14:44 christos Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -284,9 +284,9 @@ list_set_files()
split("'"${CONFIGS}"'", configs)
for (d in configs) {
xfname = fname
- sub("CONFIG", configs[d], xfname)
+ sub("@CONFIG@", configs[d], xfname)
xline = line;
- sub("CONFIG", configs[d], xline)
+ sub("@CONFIG@", configs[d], xline)
list[xline] = xfname
}
return 1
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.370 src/distrib/sets/lists/debug/mi:1.371
--- src/distrib/sets/lists/debug/mi:1.370 Wed Dec 29 17:22:13 2021
+++ src/distrib/sets/lists/debug/mi Fri Dec 31 11:14:44 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.370 2021/12/29 22:22:13 christos Exp $
+# $NetBSD: mi,v 1.371 2021/12/31 16:14:44 christos Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -325,7 +325,7 @@
./usr/libdata/debug/bin/test.debug comp-util-debug debug
./usr/libdata/debug/libexec/lfs_cleanerd.debug comp-sysutil-debug debug
./usr/libdata/debug/netbsd comp-sysutil-debug debug,kernel_dir
-./usr/libdata/debug/netbsd-CONFIG.debug comp-sysutil-debug debug
+./usr/libdata/debug/netbsd-@CONFIG@.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/amrctl.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/apmlabel.debug comp-sysutil-debug debug
./usr/libdata/debug/sbin/atactl.debug comp-sysutil-debug debug
