d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Conditionally compile [additional] programs into rescue(8) if requested

Browse Source 
Trivial oversight missed in r314240 cleanup because I enable these knobs on
my test machines.

MK_INET6_SUPPORT - rtsol
MK_NETCAT - nc

MFC after:	3 days
Sponsored by:	Dell EMC Isilon
This commit is contained in:
ngie 2017-03-12 04:24:29 +00:00
parent 4c79d31083
commit f3d523c4ac
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rescue/rescue/Makefile
View File

@ -98,7 +98,7 @@ CRUNCH_PROGS_sbin= badsect \
mount_msdosfs mount_nfs mount_nullfs \ mount_msdosfs mount_nfs mount_nullfs \
mount_udf mount_unionfs newfs \ mount_udf mount_unionfs newfs \
newfs_msdos nos-tun ping reboot \ newfs_msdos nos-tun ping reboot \
restore rcorder route rtsol savecore \ restore rcorder route savecore \
shutdown spppcontrol swapon sysctl tunefs umount shutdown spppcontrol swapon sysctl tunefs umount
.if ${MK_ATM} != "no" .if ${MK_ATM} != "no"
@ -111,6 +111,7 @@ CRUNCH_PROGS_sbin+= ccdconfig
.if ${MK_INET6_SUPPORT} != "no" .if ${MK_INET6_SUPPORT} != "no"
CRUNCH_PROGS_sbin+= ping6 CRUNCH_PROGS_sbin+= ping6
CRUNCH_PROGS_sbin+= rtsol
.endif .endif
.if ${MK_IPFILTER} != "no" .if ${MK_IPFILTER} != "no"
@ -186,7 +187,7 @@ CRUNCH_BUILDOPTS_dhclient= -DRELEASE_CRUNCH -Dlint
# #
CRUNCH_SRCDIRS+= usr.bin 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_PROGS_usr.bin+= gzip
CRUNCH_ALIAS_gzip= gunzip gzcat zcat CRUNCH_ALIAS_gzip= gunzip gzcat zcat
@ -208,6 +209,10 @@ CRUNCH_LIBS+= -lcrypto
.endif .endif
CRUNCH_LIBS+= -lmd CRUNCH_LIBS+= -lmd
.if ${MK_NETCAT} != "no"
CRUNCH_PROGS_usr.bin= nc
.endif
.if ${MK_VI} != "no" .if ${MK_VI} != "no"
CRUNCH_PROGS_usr.bin+= vi CRUNCH_PROGS_usr.bin+= vi
CRUNCH_ALIAS_vi= ex CRUNCH_ALIAS_vi= ex

2
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -3338,6 +3338,7 @@ OLD_FILES+=usr/share/man/man8/traceroute6.8.gz
.if ${MK_INET6_SUPPORT} == no .if ${MK_INET6_SUPPORT} == no
OLD_FILES+=rescue/ping6 OLD_FILES+=rescue/ping6
OLD_FILES+=rescue/rtsol
.endif .endif
.if ${MK_INETD} == no .if ${MK_INETD} == no
@ -6682,6 +6683,7 @@ OLD_FILES+=usr/share/misc/windrv_stub.c
.endif .endif
.if ${MK_NETCAT} == no .if ${MK_NETCAT} == no
OLD_FILES+=rescue/nc
OLD_FILES+=usr/bin/nc OLD_FILES+=usr/bin/nc
OLD_FILES+=usr/share/man/man1/nc.1.gz OLD_FILES+=usr/share/man/man1/nc.1.gz
.endif .endif