summaryrefslogtreecommitdiffstats
path: root/usr.sbin/Makefile
diff options
context:
space:
mode:
authorrwatson <rwatson@FreeBSD.org>2007-07-14 21:49:24 +0000
committerrwatson <rwatson@FreeBSD.org>2007-07-14 21:49:24 +0000
commitea4d9ac0d1f35d1dc3dfd0333fca52e6f92ec683 (patch)
tree4aec3325f92defda29d478c1dd870656056e3c0a /usr.sbin/Makefile
parent81f7b063ece187dd48e800e82efc3cc68af13eda (diff)
downloadFreeBSD-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 'usr.sbin/Makefile')
-rw-r--r--usr.sbin/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile
index aabfac2..867b377 100644
--- a/usr.sbin/Makefile
+++ b/usr.sbin/Makefile
@@ -197,9 +197,10 @@ SUBDIR= ac \
_sysinstall= sysinstall
.endif
-.if ${MK_ATM} != "no"
-_atm= atm
-.endif
+# Disabled in 7.0 as netatm is not MPSAFE.
+#.if ${MK_ATM} != "no"
+#_atm= atm
+#.endif
.if ${MK_AUDIT} != "no"
_audit= audit
OpenPOWER on IntegriCloud