On 10/18/13 8:38 AM, Hilko Meyer wrote: > On Thu, 17 Oct 2013 22:00:35 +0000 (UTC), in gmane.os.freebsd.devel.cvs you > wrote: > >> Author: zont >> Date: Thu Oct 17 22:00:35 2013 >> New Revision: 256710 >> URL: http://svnweb.freebsd.org/changeset/base/256710 >> >> Log: >> Add lot of missed files and dirs >> >> Modified: >> head/tools/build/mk/OptionalObsoleteFiles.inc > > This fixed two files I reported in conf/167133.2. Maybe you can look for the > other four and close the PR. >
pccard.conf - is already in ObsoleteFiles.inc. pf.conf - we cannot just put it in ObsoleteFiles.inc because people may have working configuration in this place. usr/share/examples/netgraph/bluetooth - it was missed to remove when example file inside was removed in 2007. usr/share/examples/iscsi - never used since was added in 2007. I'll commit attached patch if no objections will be met. -- Andrey Zonov
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index d77260c..7111d15 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -38,6 +38,8 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20131023: remove never used iscsi directory
+OLD_FILES+=usr/share/examples/iscsi
# 20131014: libbsdyml becomes private
OLD_FILES+=usr/lib/libbsdyml.a
OLD_FILES+=usr/lib/libbsdyml.so
@@ -2491,6 +2493,7 @@ OLD_FILES+=usr/sbin/zfs
OLD_FILES+=usr/sbin/zpool
# 20070423: rc.bluetooth (examples) removed
OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth
+OLD_DIRS+=usr/share/examples/netgraph/bluetooth
# 20070421: worm.4 removed
OLD_FILES+=usr/share/man/man4/worm.4.gz
# 20070417: trunk(4) renamed to lagg(4)
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index 379a436..9b36acc 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -325,8 +325,6 @@
..
ipfw
..
- iscsi
- ..
jails
..
kld
@@ -360,8 +358,6 @@
mdoc
..
netgraph
- bluetooth
- ..
..
pc-sysinstall
..
signature.asc
Description: OpenPGP digital signature
