diff options
| author | ngie <ngie@FreeBSD.org> | 2017-03-16 02:02:33 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2017-03-16 02:02:33 +0000 |
| commit | eb1d1203167358797c8f613f0847913341065f48 (patch) | |
| tree | a0d38791ad85247caa2acd2becf17e24f8a57c2f /rescue | |
| parent | d84fbbe9a0f89d9dd2a60d64210d1e90fa51dad7 (diff) | |
| download | FreeBSD-src-eb1d1203167358797c8f613f0847913341065f48.zip FreeBSD-src-eb1d1203167358797c8f613f0847913341065f48.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 6981e94..67414f9 100644 --- a/rescue/rescue/Makefile +++ b/rescue/rescue/Makefile @@ -97,7 +97,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" @@ -110,6 +110,7 @@ CRUNCH_PROGS_sbin+= ccdconfig .if ${MK_INET6_SUPPORT} != "no" CRUNCH_PROGS_sbin+= ping6 +CRUNCH_PROGS_sbin+= rtsol .endif .if ${MK_IPFILTER} != "no" @@ -196,7 +197,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 @@ -218,6 +219,10 @@ CRUNCH_LIBS+= -lcrypto .endif CRUNCH_LIBS+= -lmd +.if ${MK_NETCAT} != "no" +CRUNCH_PROGS_usr.bin= nc +.endif + CRUNCH_PROGS_usr.bin+= vi CRUNCH_ALIAS_vi= ex |
