From owner-svn-src-all@FreeBSD.ORG  Tue Feb 24 00:53:11 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F3B491065680;
	Tue, 24 Feb 2009 00:53:10 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C6B8B8FC0A;
	Tue, 24 Feb 2009 00:53:10 +0000 (UTC)
	(envelope-from thompsa@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1O0rApD046096;
	Tue, 24 Feb 2009 00:53:10 GMT (envelope-from thompsa@svn.freebsd.org)
Received: (from thompsa@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1O0rAtH046093;
	Tue, 24 Feb 2009 00:53:10 GMT (envelope-from thompsa@svn.freebsd.org)
Message-Id: <200902240053.n1O0rAtH046093@svn.freebsd.org>
From: Andrew Thompson <thompsa@FreeBSD.org>
Date: Tue, 24 Feb 2009 00:53:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188978 - in head: etc/mtree include usr.bin/kdump
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Feb 2009 00:53:11 -0000

Author: thompsa
Date: Tue Feb 24 00:53:10 2009
New Revision: 188978
URL: http://svn.freebsd.org/changeset/base/188978

Log:
  Install the old usb headers under /usr/include/legacy/dev/usb as they are
  needed by the hal port. This will be removed before 8.0.
  
  Add an exclusion to kdump as some structs will be redefined.
  
  Requested by:	marcus

Modified:
  head/etc/mtree/BSD.include.dist
  head/include/Makefile
  head/usr.bin/kdump/mkioctls

Modified: head/etc/mtree/BSD.include.dist
==============================================================================
--- head/etc/mtree/BSD.include.dist	Tue Feb 24 00:39:48 2009	(r188977)
+++ head/etc/mtree/BSD.include.dist	Tue Feb 24 00:53:10 2009	(r188978)
@@ -195,6 +195,12 @@
     ..
     kadm5
     ..
+    legacy
+        dev
+            usb
+            ..
+        ..
+    ..
     libmilter
     ..
     lwres

Modified: head/include/Makefile
==============================================================================
--- head/include/Makefile	Tue Feb 24 00:39:48 2009	(r188977)
+++ head/include/Makefile	Tue Feb 24 00:53:10 2009	(r188978)
@@ -54,7 +54,7 @@ LSUBDIRS=	cam/scsi \
 	security/mac_mls security/mac_partition \
 	ufs/ffs ufs/ufs
 
-LSUBSUBDIRS=	dev/mpt/mpilib
+LSUBSUBDIRS=	dev/mpt/mpilib legacy/dev/usb
 
 .if ${MACHINE_ARCH} == "powerpc"
 _dev_powermac_nvram=	dev/powermac_nvram

Modified: head/usr.bin/kdump/mkioctls
==============================================================================
--- head/usr.bin/kdump/mkioctls	Tue Feb 24 00:39:48 2009	(r188977)
+++ head/usr.bin/kdump/mkioctls	Tue Feb 24 00:53:10 2009	(r188978)
@@ -18,11 +18,14 @@ fi
 
 LC_ALL=C; export LC_ALL
 
+# include subdirs to exclude from the search
+exclude="^legacy/.*"
+
 # Build a list of headers that have ioctls in them.
 # XXX should we use an ANSI cpp?
 ioctl_includes=`
 	cd $1
-	find -H -s * -name '*.h' |
+	find -H -s * -name '*.h' \! -regex $exclude |
 		xargs egrep -l \
 '^#[ 	]*define[ 	]+[A-Za-z_][A-Za-z0-9_]*[ 	]+_IO[^a-z0-9_]' |
 		awk '{printf("#include <%s>\\\\n", $1)}'