From 435d74a43a2d49aea549da05e478e2495830c193 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Thu, 7 Aug 2003 21:26:08 +0000 Subject: [PATCH] kernel tree reorganization stage 1: Major cvs repository work (not logged as commits) plus a major reworking of the #include's to accomodate the relocations. * CVS repository files manually moved. Old directories left intact and empty (temporary). * Reorganize all filesystems into vfs/, most devices into dev/, sub-divide devices by function. * Begin to move device-specific architecture files to the device subdirs rather then throwing them all into, e.g. i386/include * Reorganize files related to system busses, placing the related code in a new bus/ directory. Also move cam to bus/cam though this may not have been the best idea in retrospect. * Reorganize emulation code and place it in a new emulation/ directory. * Remove the -I- compiler option in order to allow #include file localization, rename all config generated X.h files to use_X.h to clean up the conflicts. * Remove /usr/src/include (or /usr/include) dependancies during the kernel build, beyond what is normally needed to compile helper programs. * Make config create 'machine' softlinks for architecture specific directories outside of the standard /include. * Bump the config rev. WARNING! after this commit /usr/include and /usr/src/sys/compile/* should be regenerated from scratch. --- etc/mtree/BSD.include.dist | 110 +++++++++++++++++++------------------ include/Makefile | 38 ++++++++++--- 2 files changed, 86 insertions(+), 62 deletions(-) diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 70b6109af3..7d82679176 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -1,5 +1,5 @@ # $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.32.2.14 2003/01/24 09:47:07 roam Exp $ -# $DragonFly: src/etc/mtree/BSD.include.dist,v 1.2 2003/06/17 04:24:47 dillon Exp $ +# $DragonFly: src/etc/mtree/BSD.include.dist,v 1.3 2003/08/07 21:26:07 dillon Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -8,9 +8,13 @@ . arpa .. - cam - scsi - .. + bus + cam + scsi + .. + .. + pccard + .. .. crypto .. @@ -26,9 +30,55 @@ wi .. .. - fs - smbfs - .. + netproto + atalk + .. + atm + ipatm + .. + sigpvc + .. + spans + .. + uni + .. + .. + ipsec + .. + ipx + .. + key + .. + natm + .. + ncp + .. + ns + .. + smb + .. + .. + emulation + posix4 + .. + .. + vfs + msdosfs + .. + nfs + .. + ntfs + .. + nwfs + .. + ufs + .. + mfs + .. + isofs + cd9660 + .. + .. .. g++ std @@ -36,58 +86,20 @@ .. isc .. - isofs - cd9660 - .. - .. libmilter .. machine pc .. .. - msdosfs - .. net .. - netatalk - .. - netatm - ipatm - .. - sigpvc - .. - spans - .. - uni - .. - .. netgraph .. netinet .. netinet6 .. - netipsec - .. - netipx - .. - netkey - .. - netnatm - .. - netncp - .. - netns - .. - netsmb - .. - nfs - .. - ntfs - .. - nwfs - .. objc .. openssl @@ -108,14 +120,6 @@ .. sys .. - ufs - ffs - .. - mfs - .. - ufs - .. - .. vm .. .. diff --git a/include/Makefile b/include/Makefile index a4cc78ab11..900897f18e 100644 --- a/include/Makefile +++ b/include/Makefile @@ -1,6 +1,6 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 # $FreeBSD: src/include/Makefile,v 1.109.2.27 2003/01/24 05:12:29 sam Exp $ -# $DragonFly: src/include/Makefile,v 1.2 2003/06/17 04:25:56 dillon Exp $ +# $DragonFly: src/include/Makefile,v 1.3 2003/08/07 21:26:08 dillon Exp $ # # Doing a make install builds /usr/include # @@ -33,14 +33,18 @@ SHDRS= soundcard.h joystick.h LHDRS= aio.h errno.h fcntl.h inttypes.h linker_set.h poll.h syslog.h \ termios.h ucontext.h -LDIRS= cam msdosfs net netatalk netatm netgraph netinet netinet6 netipsec \ - netipx netkey netnatm netncp netns netsmb nfs ntfs nwfs pccard posix4 \ - sys vm +LDIRS= net netgraph netinet netinet6 sys vm -LSUBDIRS= cam/scsi dev/an dev/firewire dev/ppbus dev/usb dev/wi \ - fs/smbfs isofs/cd9660 \ - netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ - ufs/ffs ufs/mfs ufs/ufs +LSUBDIRS= bus/cam bus/cam/scsi \ + emulation/posix4 \ + vfs/msdosfs vfs/nfs vfs/ntfs vfs/nwfs \ + vfs/ufs \ + bus/cam bus/pccard \ + netproto/atalk netproto/atm netproto/ipsec netproto/ipx \ + netproto/key netproto/natm netproto/ncp netproto/ns netproto/smb \ + netproto/atm/ipatm netproto/atm/sigpvc netproto/atm/spans \ + netproto/atm/uni \ +# dev/an dev/firewire dev/ppbus dev/usb dev/wi \ # For SHARED=symlinks, cam and netatm are symlinks, so cam/scsi and netatm/* # are taken care of @@ -75,8 +79,24 @@ INCSLINKS+= sys/$i ${INCLUDEDIR}/$i INCSLINKS+= machine/$i ${INCLUDEDIR}/$i .endfor .for i in ${PHDRS} -INCSLINKS+= posix4/$i ${INCLUDEDIR}/$i +INCSLINKS+= emulation/posix4/$i ${INCLUDEDIR}/$i .endfor +INCSLINKS+= bus/cam ${INCLUDEDIR}/cam +INCSLINKS+= vfs/msdosfs ${INCLUDEDIR}/msdosfs +INCSLINKS+= vfs/nfs ${INCLUDEDIR}/nfs +INCSLINKS+= vfs/ntfs ${INCLUDEDIR}/ntfs +INCSLINKS+= vfs/nwfs ${INCLUDEDIR}/nwfs +INCSLINKS+= vfs ${INCLUDEDIR}/fs +INCSLINKS+= netproto/atalk ${INCLUDEDIR}/netatalk +INCSLINKS+= netproto/atm ${INCLUDEDIR}/netatm +INCSLINKS+= netproto/ipsec ${INCLUDEDIR}/netipsec +INCSLINKS+= netproto/ipx ${INCLUDEDIR}/netipx +INCSLINKS+= netproto/key ${INCLUDEDIR}/netkey +INCSLINKS+= netproto/natm ${INCLUDEDIR}/netnatm +INCSLINKS+= netproto/ncp ${INCLUDEDIR}/netncp +INCSLINKS+= netproto/ns ${INCLUDEDIR}/netns +INCSLINKS+= netproto/smb ${INCLUDEDIR}/netsmb +INCSLINKS+= bus/pccard ${INCLUDEDIR}/pccard copies: .for i in ${LDIRS} ${LSYMSUBDIRS} machine crypto -- 2.35.2