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 /etc/mtree | |
| parent | d7f81adbd479ece5ae8b76405ca7520e2210f42f (diff) | |
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 'etc/mtree')
| -rw-r--r-- | etc/mtree/BSD.include.dist | 21 | ||||
| -rw-r--r-- | etc/mtree/BSD.usr.dist | 5 |
2 files changed, 14 insertions, 12 deletions
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index d38c479be161..aadeefc14748 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -205,16 +205,17 @@ .. netatalk .. - netatm - ipatm - .. - sigpvc - .. - spans - .. - uni - .. - .. +# Disabled in 7.0 as netatm is not MPSAFE. +# netatm +# ipatm +# .. +# sigpvc +# .. +# spans +# .. +# uni +# .. +# .. netgraph atm .. diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index c457c4a14eec..dd039d53e16c 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -187,8 +187,9 @@ .. IPv6 .. - atm - .. +# Disabled in 7.0 as netatm is not MPSAFE. +# atm +# .. bc .. bootforth |