Module Name: src
Committed By: matt
Date: Fri Jan 28 20:36:20 UTC 2011
Modified Files:
src/distrib/sets: sets.subr
Added Files:
src/distrib/sets/lists/tests: md.evbppc
Log Message:
Add a method to a whiteout an entry thereby allowing a md/ad file to remove
a file from the set lists.
Use this for md.evbppc which doesn't build some module tests.
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/distrib/sets/sets.subr
cvs rdiff -u -r0 -r1.1 src/distrib/sets/lists/tests/md.evbppc
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.126 src/distrib/sets/sets.subr:1.127
--- src/distrib/sets/sets.subr:1.126 Tue Dec 28 09:15:24 2010
+++ src/distrib/sets/sets.subr Fri Jan 28 20:36:19 2011
@@ -1,4 +1,4 @@
-# $NetBSD: sets.subr,v 1.126 2010/12/28 09:15:24 he Exp $
+# $NetBSD: sets.subr,v 1.127 2011/01/28 20:36:19 matt Exp $
#
#
@@ -172,7 +172,7 @@
# In each file, a record consists of a path and a System Package name,
# separated by whitespace. E.g.,
#
-# # $NetBSD: sets.subr,v 1.126 2010/12/28 09:15:24 he Exp $
+# # $NetBSD: sets.subr,v 1.127 2011/01/28 20:36:19 matt Exp $
# . base-sys-root [keyword[,...]]
# ./altroot base-sys-root
# ./bin base-sys-root
@@ -299,7 +299,16 @@
next;
}
+ /^-/ {
+ notwanted[substr($1, 2)] = 1;
+ delete list [substr($1, 2)];
+ next;
+ }
+
+
NF > 2 && $3 != "-" {
+ if (notwanted[$1] != "")
+ next;
split($3, keywords, ",")
show = 1
haveobs = 0
@@ -323,13 +332,21 @@
if (obsolete && ! haveobs)
next
if (show)
- print
+ list[$1] = $0
next
}
{
+ if (notwanted[$1] != "")
+ next;
if (! obsolete)
- print
+ list[$1] = $0
+ }
+
+ END {
+ for (i in list) {
+ print list[i]
+ }
}'
}
Added files:
Index: src/distrib/sets/lists/tests/md.evbppc
diff -u /dev/null src/distrib/sets/lists/tests/md.evbppc:1.1
--- /dev/null Fri Jan 28 20:36:20 2011
+++ src/distrib/sets/lists/tests/md.evbppc Fri Jan 28 20:36:20 2011
@@ -0,0 +1,6 @@
+# $NetBSD: md.evbppc,v 1.1 2011/01/28 20:36:20 matt Exp $
+#
+# Note: don't delete entries from here - mark them as "obsolete" instead.
+#
+-./usr/libdata/debug/usr/tests/modules/t_builtin.debug
+-./usr/libdata/debug/usr/tests/modules/t_modctl.debug
