Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Feb 2009 00:53:10 +0000 (UTC)
From:      Andrew Thompson <thompsa@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r188978 - in head: etc/mtree include usr.bin/kdump
Message-ID:  <200902240053.n1O0rAtH046093@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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)}'



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