Date: Sun, 12 Mar 2017 04:24:29 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r315113 - in head: rescue/rescue tools/build/mk Message-ID: <201703120424.v2C4OU3m041407@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sun Mar 12 04:24:29 2017 New Revision: 315113 URL: https://svnweb.freebsd.org/changeset/base/315113 Log: 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 MFC after: 3 days Sponsored by: Dell EMC Isilon Modified: head/rescue/rescue/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc Modified: head/rescue/rescue/Makefile ============================================================================== --- head/rescue/rescue/Makefile Sun Mar 12 04:15:56 2017 (r315112) +++ head/rescue/rescue/Makefile Sun Mar 12 04:24:29 2017 (r315113) @@ -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" @@ -186,7 +187,7 @@ CRUNCH_BUILDOPTS_dhclient= -DRELEASE_CRU # 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 @@ -208,6 +209,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 Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Sun Mar 12 04:15:56 2017 (r315112) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Sun Mar 12 04:24:29 2017 (r315113) @@ -3338,6 +3338,7 @@ OLD_FILES+=usr/share/man/man8/traceroute .if ${MK_INET6_SUPPORT} == no OLD_FILES+=rescue/ping6 +OLD_FILES+=rescue/rtsol .endif .if ${MK_INETD} == no @@ -6682,6 +6683,7 @@ OLD_FILES+=usr/share/misc/windrv_stub.c .endif .if ${MK_NETCAT} == no +OLD_FILES+=rescue/nc OLD_FILES+=usr/bin/nc OLD_FILES+=usr/share/man/man1/nc.1.gz .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703120424.v2C4OU3m041407>