aboutsummaryrefslogtreecommitdiff
path: root/rescue
diff options
context:
space:
mode:
authorRobert Watson <rwatson@FreeBSD.org>2007-07-14 21:49:24 +0000
committerRobert Watson <rwatson@FreeBSD.org>2007-07-14 21:49:24 +0000
commit2b851aeb6321494fe153410e910ccf4ec1d92513 (patch)
tree4aec3325f92defda29d478c1dd870656056e3c0a /rescue
parentd7f81adbd479ece5ae8b76405ca7520e2210f42f (diff)
downloadsrc-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 'rescue')
-rw-r--r--rescue/rescue/Makefile6
1 files changed, 4 insertions, 2 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile
index 23bea899565a..e0c05be2c4f6 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"