8 files changed, 26 insertions, 13 deletions
diff --git a/release/picobsd/bridge/crunch1/crunch.conf b/release/picobsd/bridge/crunch1/crunch.conf
index 094d5607b455..7b3845621c71 100644
--- a/release/picobsd/bridge/crunch1/crunch.conf
+++ b/release/picobsd/bridge/crunch1/crunch.conf
@@ -4,6 +4,9 @@
 # NOTE: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
 
+# Default build options.
+buildopts -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+
 # other sources
 srcdirs /usr/src/bin
 srcdirs /usr/src/sbin/i386
diff --git a/release/picobsd/build/Makefile.crunch b/release/picobsd/build/Makefile.crunch
index bde8d9afc319..8714a4c73253 100644
--- a/release/picobsd/build/Makefile.crunch
+++ b/release/picobsd/build/Makefile.crunch
@@ -2,7 +2,6 @@
 # $FreeBSD$
 #
 SRC?=/usr/src
-CRUNCHFLAGS+= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT
 
 all: crunch
 
@@ -11,10 +10,9 @@ crunch:
 	@( if [ -f crunch.inc ] ; then \
 		crunchgen -h ./crunch.inc ./crunch1.conf ; \
 	else \
-		crunchgen -h ../../build/crunch.inc ./crunch1.conf ; \
+		crunchgen ./crunch1.conf ; \
 	fi )
-	@${MAKE} -f crunch1.mk $(CRUNCHFLAGS) all \
-	    "CFLAGS=${CFLAGS} ${CRUNCHFLAGS}" #2>&1 >/dev/null
+	@env ${MAKE} -f crunch1.mk all
 	strip --remove-section=.note --remove-section=.comment crunch1
 
 
diff --git a/release/picobsd/custom/crunch1/crunch.conf b/release/picobsd/custom/crunch1/crunch.conf
index 6fa52f43bc34..cf7896208c10 100644
--- a/release/picobsd/custom/crunch1/crunch.conf
+++ b/release/picobsd/custom/crunch1/crunch.conf
@@ -13,7 +13,7 @@ srcdirs /usr/src/usr.bin
 srcdirs /usr/src/gnu/usr.bin
 srcdirs /usr/src/usr.sbin
 # sources for ns & vm
-srcdirs ../../tinyware
+srcdirs /usr/src/release/picobsd/tinyware
 
 progs sh test ln login getty stty
 progs w msg kget reboot
diff --git a/release/picobsd/dial/crunch1/crunch.conf b/release/picobsd/dial/crunch1/crunch.conf
index 431eb7ea7893..d7caf9e61901 100644
--- a/release/picobsd/dial/crunch1/crunch.conf
+++ b/release/picobsd/dial/crunch1/crunch.conf
@@ -2,10 +2,9 @@
 #
 # NOTE1: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
-#
-# NOTE2: use of init(8) is now optional (selectable in "build" script).
-# See Makefile for details on how it's added here - you shouldn't add it
-# manually here...
+
+# Default build options
+buildopts -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
 
 # other sources
 srcdirs /usr/src/bin
@@ -28,7 +27,7 @@ ln less more
 
 progs sh test kget echo pwd msg stty
 progs hostname cat kill sps vm ns
-progs chmod chown help
+progs chmod chown help getty
 progs cp df fsck ping mv ln traceroute
 progs ifconfig kbdcontrol moused
 progs ls mkdir mount mount_msdos mount_cd9660 mount_ext2fs
@@ -47,4 +46,3 @@ ln chown chgrp
 libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lgnuregex -lmp -lgmp -lm
 libs -lncurses -lmytinfo -lipx -lz
 libs -ltermcap -ltelnet -lalias
-libs -lradius	# for ppp
diff --git a/release/picobsd/install/crunch1/crunch.conf b/release/picobsd/install/crunch1/crunch.conf
index 3984f1ca6af9..3a45dc126a0b 100644
--- a/release/picobsd/install/crunch1/crunch.conf
+++ b/release/picobsd/install/crunch1/crunch.conf
@@ -4,6 +4,9 @@
 # NOTE: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
 
+# Default build options
+buildopts -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+
 # other sources
 srcdirs /usr/src/bin
 srcdirs /usr/src/sbin/i386
diff --git a/release/picobsd/isp/crunch1/crunch.conf b/release/picobsd/isp/crunch1/crunch.conf
index 8b19d573915c..ecbf65ed270c 100644
--- a/release/picobsd/isp/crunch1/crunch.conf
+++ b/release/picobsd/isp/crunch1/crunch.conf
@@ -4,6 +4,9 @@
 # NOTE: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
 
+# Default build options
+buildopts -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+
 # other sources
 srcdirs /usr/src/bin
 srcdirs /usr/src/sbin/i386
diff --git a/release/picobsd/net/crunch1/crunch.conf b/release/picobsd/net/crunch1/crunch.conf
index 3152984bbcaf..587296ff91c0 100644
--- a/release/picobsd/net/crunch1/crunch.conf
+++ b/release/picobsd/net/crunch1/crunch.conf
@@ -4,6 +4,9 @@
 # NOTE: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
 
+# Default build options.
+buildopts -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+
 # other sources
 srcdirs /usr/src/bin
 srcdirs /usr/src/sbin/i386
@@ -23,11 +26,14 @@ progs sysctl route pwd_mkdb dev_mkdb
 progs mount mount_msdos umount
 progs kill mount_std natd
 
-progs pwd ppp telnet less
+progs pwd telnet less
 ln less more
 progs passwd date
 progs mount_cd9660 mount_nfs ping traceroute routed ipfw
 
+progs ppp
+special ppp buildopts -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B
+
 progs minigzip
 ln minigzip gzip
 ln mount_cd9660 cd9660
@@ -45,4 +51,3 @@ ln chown chgrp
 libs -lncurses -lmytinfo -lipx -lz -lpcap -lalias -lwrap
 libs -ledit -lutil -lmd -lcrypt -lmp -lgmp -lm -lkvm
 libs -lgnuregex -ltelnet
-libs -lradius # used by ppp
diff --git a/release/picobsd/router/crunch1/crunch.conf b/release/picobsd/router/crunch1/crunch.conf
index 5ab444d58000..5e655a27aaf6 100644
--- a/release/picobsd/router/crunch1/crunch.conf
+++ b/release/picobsd/router/crunch1/crunch.conf
@@ -4,6 +4,9 @@
 # NOTE: the string "/usr/src" will be automatically replaced with the
 # correct value set in 'build' script - you should change it there
 
+# Default build options
+buildopts -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC
+
 # other sources
 srcdirs /usr/src/bin
 srcdirs /usr/src/sbin/i386