Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 23 Oct 2013 12:34:58 -0700
From:      Andrey Zonov <zont@FreeBSD.org>
To:        Hilko Meyer <hilko.meyer@gmx.de>
Cc:        svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org
Subject:   Re: svn commit: r256710 - head/tools/build/mk
Message-ID:  <526824E2.6000309@FreeBSD.org>
In-Reply-To: <97l269dokal3obs07tc792auspk1e0j0nj@4ax.com>
References:  <201310172200.r9HM0ZFM072006__34950.8864027031$1382047250$gmane$org@svn.freebsd.org> <97l269dokal3obs07tc792auspk1e0j0nj@4ax.com>

next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--Gw29xVMKjI0xNjtGSrRCFjTB7eaSojQqs
Content-Type: multipart/mixed;
 boundary="------------050305090704050501080009"

This is a multi-part message in MIME format.
--------------050305090704050501080009
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

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:
>=20
>> 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
>=20
> This fixed two files I reported in conf/167133.2. Maybe you can look fo=
r the
> other four and close the PR.
>=20

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.

--=20
Andrey Zonov

--------------050305090704050501080009
Content-Type: text/plain; charset=UTF-8; x-mac-type="0"; x-mac-creator="0";
 name="cleanup-dirs.patch"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
 filename="cleanup-dirs.patch"

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
=20
+# 20131023: remove never used iscsi directory
+OLD_FILES+=3Dusr/share/examples/iscsi
 # 20131014: libbsdyml becomes private
 OLD_FILES+=3Dusr/lib/libbsdyml.a
 OLD_FILES+=3Dusr/lib/libbsdyml.so
@@ -2491,6 +2493,7 @@ OLD_FILES+=3Dusr/sbin/zfs
 OLD_FILES+=3Dusr/sbin/zpool
 # 20070423: rc.bluetooth (examples) removed
 OLD_FILES+=3Dusr/share/examples/netgraph/bluetooth/rc.bluetooth
+OLD_DIRS+=3Dusr/share/examples/netgraph/bluetooth
 # 20070421: worm.4 removed
 OLD_FILES+=3Dusr/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
             ..

--------------050305090704050501080009--

--Gw29xVMKjI0xNjtGSrRCFjTB7eaSojQqs
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG/MacGPG2 v2.0.18 (Darwin)
Comment: GPGTools - http://gpgtools.org

iQEcBAEBAgAGBQJSaCTkAAoJEBWLemxX/CvTBFEH/2QOUJUVH5+K1rRcR5cjqadw
hwYPP9Vmp2TJQ38hcR3B7iILgwSemnLBjlEsZ28bUfbG9FHVGIfl3IQXYgOQN0yN
GhQB++n4fpJBNHKOy2ZXzxlxCl9hfw0Wps7G/0sZeNaDkxdMP7Znr0FowptbyoQM
AdjGAKTIEIXnzeFVQ+W7qHeII/CtwX+jBXMgo1nybusq2GqCNMkDz7YBLR5mL3W+
lRPpHexNa4apeyLwndX+HWLOkkku2zhK+N5pwMFxDDILmq93PAUeXiI259Dknbxi
64ocT6/G3JdAvheWTUxd96d6vEvhJqvrK+Qn+TBaljAPQZfwmvaMZXwcIrE/Leo=
=Ot0B
-----END PGP SIGNATURE-----

--Gw29xVMKjI0xNjtGSrRCFjTB7eaSojQqs--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?526824E2.6000309>