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 /share/examples | |
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 'share/examples')
-rw-r--r-- | share/examples/Makefile | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/share/examples/Makefile b/share/examples/Makefile index 6d92c2d..072f6c8 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -7,7 +7,6 @@ LDIRS= BSD_daemon \ FreeBSD_version \ IPv6 \ - atm \ bootforth \ cvsup \ diskless \ @@ -35,6 +34,9 @@ LDIRS= BSD_daemon \ startslip \ sunrpc +# Disabled in 7.0 as netatm is not MPSAFE. +#LDIRS+= atm + XFILES= BSD_daemon/FreeBSD.pfa \ BSD_daemon/README \ BSD_daemon/beastie.eps \ @@ -45,15 +47,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \ FreeBSD_version/Makefile \ FreeBSD_version/README \ IPv6/USAGE \ - atm/NOTES \ - atm/README \ - atm/Startup \ - atm/atm-config.sh \ - atm/atm-sockets.txt \ - atm/cpcs-design.txt \ - atm/fore-microcode.txt \ - atm/sscf-design.txt \ - atm/sscop-design.txt \ bootforth/README \ bootforth/boot.4th \ bootforth/frames.4th \ @@ -246,6 +239,17 @@ XFILES= BSD_daemon/FreeBSD.pfa \ sunrpc/sort/sort.x \ sunrpc/sort/sort_proc.c +# Disabled in 7.0 as netatm is not MPSAFE. +#XFILES+= atm/NOTES \ +# atm/README \ +# atm/Startup \ +# atm/atm-config.sh \ +# atm/atm-sockets.txt \ +# atm/cpcs-design.txt \ +# atm/fore-microcode.txt \ +# atm/sscf-design.txt \ +# atm/sscop-design.txt + BINDIR= ${SHAREDIR}/examples NO_OBJ= |