From cc80a61ac010c44a82cabfa7a439687df98bdb42 Mon Sep 17 00:00:00 2001 From: Josef Karthauser Date: Wed, 15 Nov 2000 14:47:37 +0000 Subject: [PATCH] Wrap the build options up into the crunch.conf file now that crunchgen knows what to do with them. --- release/picobsd/bridge/crunch1/crunch.conf | 3 +++ release/picobsd/bridge/crunch1/crunch.inc | 13 ------------- release/picobsd/custom/crunch1/crunch.inc | 13 ------------- release/picobsd/dial/crunch1/crunch.conf | 3 +++ release/picobsd/dial/crunch1/crunch.inc | 12 ------------ release/picobsd/install/crunch1/crunch.conf | 3 +++ release/picobsd/install/crunch1/crunch.inc | 12 ------------ release/picobsd/isp/crunch1/crunch.conf | 3 +++ release/picobsd/isp/crunch1/crunch.inc | 12 ------------ release/picobsd/net/crunch1/crunch.conf | 8 +++++++- release/picobsd/net/crunch1/crunch.inc | 13 ------------- release/picobsd/router/crunch1/crunch.conf | 3 +++ release/picobsd/router/crunch1/crunch.inc | 12 ------------ 13 files changed, 22 insertions(+), 88 deletions(-) delete mode 100644 release/picobsd/bridge/crunch1/crunch.inc delete mode 100644 release/picobsd/custom/crunch1/crunch.inc delete mode 100644 release/picobsd/dial/crunch1/crunch.inc delete mode 100644 release/picobsd/install/crunch1/crunch.inc delete mode 100644 release/picobsd/isp/crunch1/crunch.inc delete mode 100644 release/picobsd/net/crunch1/crunch.inc delete mode 100644 release/picobsd/router/crunch1/crunch.inc diff --git a/release/picobsd/bridge/crunch1/crunch.conf b/release/picobsd/bridge/crunch1/crunch.conf index 094d5607b45..7b3845621c7 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/bridge/crunch1/crunch.inc b/release/picobsd/bridge/crunch1/crunch.inc deleted file mode 100644 index eb7826768a7..00000000000 --- a/release/picobsd/bridge/crunch1/crunch.inc +++ /dev/null @@ -1,13 +0,0 @@ -# $FreeBSD$ - -# Anything that you add to OPTS will be added to the build rules for each -# program built. - -OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC - - -# Per program options can be added also... -# i.e. -# ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH - -#end diff --git a/release/picobsd/custom/crunch1/crunch.inc b/release/picobsd/custom/crunch1/crunch.inc deleted file mode 100644 index 7f407213606..00000000000 --- a/release/picobsd/custom/crunch1/crunch.inc +++ /dev/null @@ -1,13 +0,0 @@ -# You can add make variables and targets for the crunch building process -# $FreeBSD$ - -# Anything that you add to OPTS will be added to the build rules for each -# program built. -# i.e: -# OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC - - -# Per program options can be added also by defining prog_OPTS: -# ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH - -#end diff --git a/release/picobsd/dial/crunch1/crunch.conf b/release/picobsd/dial/crunch1/crunch.conf index 847774bf922..d7caf9e6190 100644 --- a/release/picobsd/dial/crunch1/crunch.conf +++ b/release/picobsd/dial/crunch1/crunch.conf @@ -3,6 +3,9 @@ # NOTE1: 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/dial/crunch1/crunch.inc b/release/picobsd/dial/crunch1/crunch.inc deleted file mode 100644 index 91ddee87cdb..00000000000 --- a/release/picobsd/dial/crunch1/crunch.inc +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ - -# Anything that you add to OPTS will be added to the build rules for each -# program built. - -OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC - - -# Per program options can be added also... -#ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH - -#end diff --git a/release/picobsd/install/crunch1/crunch.conf b/release/picobsd/install/crunch1/crunch.conf index 3984f1ca6af..3a45dc126a0 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/install/crunch1/crunch.inc b/release/picobsd/install/crunch1/crunch.inc deleted file mode 100644 index 91ddee87cdb..00000000000 --- a/release/picobsd/install/crunch1/crunch.inc +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ - -# Anything that you add to OPTS will be added to the build rules for each -# program built. - -OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC - - -# Per program options can be added also... -#ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH - -#end diff --git a/release/picobsd/isp/crunch1/crunch.conf b/release/picobsd/isp/crunch1/crunch.conf index 8b19d573915..ecbf65ed270 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/isp/crunch1/crunch.inc b/release/picobsd/isp/crunch1/crunch.inc deleted file mode 100644 index 91ddee87cdb..00000000000 --- a/release/picobsd/isp/crunch1/crunch.inc +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ - -# Anything that you add to OPTS will be added to the build rules for each -# program built. - -OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC - - -# Per program options can be added also... -#ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH - -#end diff --git a/release/picobsd/net/crunch1/crunch.conf b/release/picobsd/net/crunch1/crunch.conf index eb48d546b77..587296ff91c 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 diff --git a/release/picobsd/net/crunch1/crunch.inc b/release/picobsd/net/crunch1/crunch.inc deleted file mode 100644 index a8834f21ad8..00000000000 --- a/release/picobsd/net/crunch1/crunch.inc +++ /dev/null @@ -1,13 +0,0 @@ -# $FreeBSD$ - -# Anything that you add to OPTS will be added to the build rules for each -# program built. - -OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC - - -# Per program options can be added also... - -ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH - -#end diff --git a/release/picobsd/router/crunch1/crunch.conf b/release/picobsd/router/crunch1/crunch.conf index 5ab444d5800..5e655a27aaf 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 diff --git a/release/picobsd/router/crunch1/crunch.inc b/release/picobsd/router/crunch1/crunch.inc deleted file mode 100644 index 91ddee87cdb..00000000000 --- a/release/picobsd/router/crunch1/crunch.inc +++ /dev/null @@ -1,12 +0,0 @@ -# $FreeBSD$ - -# Anything that you add to OPTS will be added to the build rules for each -# program built. - -OPTS= -DNOPAM -DRELEASE_CRUNCH -DNOSECURE -DNOCRYPT -DNONETGRAPH -DNOIPSEC - - -# Per program options can be added also... -#ppp_OPTS= -DNOKLDLOAD -DNOINET6 -DNONAT -DNOATM -DNOSUID -DHAVE_DES -DNORADIUS -DNOI4B -DNONETGRAPH - -#end