diff options
author | Robert Watson <rwatson@FreeBSD.org> | 2007-07-14 21:49:24 +0000 |
---|---|---|
committer | Robert Watson <rwatson@FreeBSD.org> | 2007-07-14 21:49:24 +0000 |
commit | 2b851aeb6321494fe153410e910ccf4ec1d92513 (patch) | |
tree | 4aec3325f92defda29d478c1dd870656056e3c0a /include/Makefile | |
parent | d7f81adbd479ece5ae8b76405ca7520e2210f42f (diff) | |
download | src-2b851aeb6321494fe153410e910ccf4ec1d92513.tar.gz src-2b851aeb6321494fe153410e910ccf4ec1d92513.zip |
Disconnect netatm from the build as it is not MPSAFE and relies on
NET_NEEDS_GIANT, which will shortly be removed. This is done in a
away that it may be easily reattached to the build before 7.1 if
appropriate locking is added. Specifics:
- Don't install netatm include files
- Disconnect netatm command line management tools
- Don't build libatm
- Don't include ATM parts in rescue or sysinstall
- Don't install sample configuration files and documents
- Don't build kernel support as a module or in NOTES
- Don't build netgraph wrapper nodes for netatm
This removes the last remaining consumer of NET_NEEDS_GIANT.
Reviewed by: harti
Discussed with: bz, bms
Approved by: re (kensmith)
Notes
Notes:
svn path=/head/; revision=171453
Diffstat (limited to 'include/Makefile')
-rw-r--r-- | include/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/Makefile b/include/Makefile index 20d8d151dbf5..d012e0eadb8c 100644 --- a/include/Makefile +++ b/include/Makefile @@ -36,10 +36,11 @@ PHDRS= sched.h semaphore.h _semaphore.h LHDRS= aio.h errno.h fcntl.h linker_set.h poll.h stdint.h syslog.h \ termios.h ucontext.h -LDIRS= bsm cam geom net net80211 netatalk netatm netgraph netinet netinet6 \ +LDIRS= bsm cam geom net net80211 netatalk netgraph netinet netinet6 \ netipsec ${_netipx} netnatm ${_netncp} netsmb \ nfs nfsclient nfsserver \ pccard sys vm +#LDIRS+= netatm LSUBDIRS= cam/scsi \ dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \ @@ -49,12 +50,12 @@ LSUBDIRS= cam/scsi \ ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \ - netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ netgraph/atm netgraph/netflow \ security/audit \ security/mac_biba security/mac_bsdextended security/mac_lomac \ security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs +#LSUBDIRS+= netatm/ipatm netatm/sigpvc netatm/spans netatm/uni .if ${MACHINE_ARCH} == "powerpc" _dev_powermac_nvram= dev/powermac_nvram |