diff options
| author | rwatson <rwatson@FreeBSD.org> | 2007-07-14 21:49:24 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2007-07-14 21:49:24 +0000 |
| commit | ea4d9ac0d1f35d1dc3dfd0333fca52e6f92ec683 (patch) | |
| tree | 4aec3325f92defda29d478c1dd870656056e3c0a /rescue | |
| parent | 81f7b063ece187dd48e800e82efc3cc68af13eda (diff) | |
| download | FreeBSD-src-ea4d9ac0d1f35d1dc3dfd0333fca52e6f92ec683.zip FreeBSD-src-ea4d9ac0d1f35d1dc3dfd0333fca52e6f92ec683.tar.gz | |
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)
Diffstat (limited to 'rescue')
| -rw-r--r-- | rescue/rescue/Makefile | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 23bea89..e0c05be 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -119,8 +119,10 @@ CRUNCH_PROGS_sbin= atacontrol badsect bsdlabel \ slattach spppcontrol startslip swapon sysctl tunefs umount .if ${MK_ATM} != "no" -CRUNCH_PROGS_sbin+= atm atmconfig fore_dnld ilmid -CRUNCH_LIBS+= -latm +CRUNCH_PROGS_sbin+= atmconfig +# Disabled in 7.0 as netatm is not MPSAFE. +#CRUNCH_PROGS_sbin+= atm fore_dnld ilmid +#CRUNCH_LIBS+= -latm .endif .if ${MK_INET6_SUPPORT} != "no" |
