diff options
| author | ngie <ngie@FreeBSD.org> | 2017-03-16 02:04:13 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-03-16 02:04:13 +0000 |
| commit | 1081df0b9dfc3c7c1ab2c155dd2d63e661cb0c06 (patch) | |
| tree | 86abc84b374d6ee2deda240566aac40f27c55ce3 /rescue | |
| parent | 48fe6af21e980bd138851c30613334c68f655f23 (diff) | |
| download | FreeBSD-src-1081df0b9dfc3c7c1ab2c155dd2d63e661cb0c06.zip FreeBSD-src-1081df0b9dfc3c7c1ab2c155dd2d63e661cb0c06.tar.gz | |
MFC r315113:
Conditionally compile [additional] programs into rescue(8) if requested
Trivial oversight missed in r314240 cleanup because I enable these knobs on
my test machines.
MK_INET6_SUPPORT - rtsol
MK_NETCAT - nc
Diffstat (limited to 'rescue')
| -rw-r--r-- | rescue/rescue/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/rescue/rescue/Makefile b/rescue/rescue/Makefile index 918090c..fbf73df 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -98,7 +98,7 @@ CRUNCH_PROGS_sbin= badsect \ mount_msdosfs mount_nfs mount_nullfs \ mount_udf mount_unionfs newfs \ newfs_msdos nos-tun ping reboot \ - restore rcorder route rtsol savecore \ + restore rcorder route savecore \ shutdown spppcontrol swapon sysctl tunefs umount .if ${MK_ATM} != "no" @@ -111,6 +111,7 @@ CRUNCH_PROGS_sbin+= ccdconfig .if ${MK_INET6_SUPPORT} != "no" CRUNCH_PROGS_sbin+= ping6 +CRUNCH_PROGS_sbin+= rtsol .endif .if ${MK_IPFILTER} != "no" @@ -190,7 +191,7 @@ CRUNCH_BUILDOPTS_dhclient= -DRELEASE_CRUNCH -Dlint # CRUNCH_SRCDIRS+= usr.bin -CRUNCH_PROGS_usr.bin= head mt nc sed tail tee +CRUNCH_PROGS_usr.bin= head mt sed tail tee CRUNCH_PROGS_usr.bin+= gzip CRUNCH_ALIAS_gzip= gunzip gzcat zcat @@ -212,6 +213,10 @@ CRUNCH_LIBS+= -lcrypto .endif CRUNCH_LIBS+= -lmd +.if ${MK_NETCAT} != "no" +CRUNCH_PROGS_usr.bin= nc +.endif + .if ${MK_VI} != "no" CRUNCH_PROGS_usr.bin+= vi CRUNCH_ALIAS_vi= ex |
