diff options
| author | thompsa <thompsa@FreeBSD.org> | 2009-02-24 00:53:10 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2009-02-24 00:53:10 +0000 |
| commit | 78cea5d6be572a137f48d96cda3aa081454fffc3 (patch) | |
| tree | d0bba76dcbc288bad715b392c05f0eaada370eaa | |
| parent | cf8a92987a9233b1d42762c9a4847b890f937561 (diff) | |
| download | FreeBSD-src-78cea5d6be572a137f48d96cda3aa081454fffc3.zip FreeBSD-src-78cea5d6be572a137f48d96cda3aa081454fffc3.tar.gz | |
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
| -rw-r--r-- | etc/mtree/BSD.include.dist | 6 | ||||
| -rw-r--r-- | include/Makefile | 2 | ||||
| -rw-r--r-- | usr.bin/kdump/mkioctls | 5 |
3 files changed, 11 insertions, 2 deletions
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index a3dade4..8ea1eee 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -195,6 +195,12 @@ .. kadm5 .. + legacy + dev + usb + .. + .. + .. libmilter .. lwres diff --git a/include/Makefile b/include/Makefile index aea958a..6e116c4 100644 --- a/include/Makefile +++ b/include/Makefile @@ -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 diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls index 5feae11..cad3c96 100644 --- a/usr.bin/kdump/mkioctls +++ b/usr.bin/kdump/mkioctls @@ -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)}' |
