Date: Sat, 25 Feb 2017 03:23:11 +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: r314240 - in head: rescue/rescue tools/build/mk Message-ID: <201702250323.v1P3NB0G014830@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sat Feb 25 03:23:11 2017 New Revision: 314240 URL: https://svnweb.freebsd.org/changeset/base/314240 Log: Conditionally compile certain programs into rescue(8) if requested MK_CCD - ccdconfig MK_ROUTED - routed, rtquery MFC after: 2 weeks 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 Sat Feb 25 03:11:08 2017 (r314239) +++ head/rescue/rescue/Makefile Sat Feb 25 03:23:11 2017 (r314240) @@ -90,7 +90,7 @@ CRUNCH_SUPPRESS_LINK_-tcsh= 1 # CRUNCH_SRCDIRS+= sbin CRUNCH_PROGS_sbin= badsect \ - camcontrol ccdconfig clri devfs dmesg dump \ + camcontrol clri devfs dmesg dump \ dumpfs dumpon fsck fsck_ffs fsck_msdosfs fsdb \ fsirand gbde geom ifconfig init \ kldconfig kldload kldstat kldunload ldconfig \ @@ -98,13 +98,17 @@ CRUNCH_PROGS_sbin= badsect \ mount_msdosfs mount_nfs mount_nullfs \ mount_udf mount_unionfs newfs \ newfs_msdos nos-tun ping reboot \ - restore rcorder route routed rtquery rtsol savecore \ + restore rcorder route rtsol savecore \ shutdown spppcontrol swapon sysctl tunefs umount .if ${MK_ATM} != "no" CRUNCH_PROGS_sbin+= atmconfig .endif +.if ${MK_CCD} != "no" +CRUNCH_PROGS_sbin+= ccdconfig +.endif + .if ${MK_INET6_SUPPORT} != "no" CRUNCH_PROGS_sbin+= ping6 .endif @@ -112,6 +116,11 @@ CRUNCH_PROGS_sbin+= ping6 .if ${MK_IPFILTER} != "no" CRUNCH_PROGS_sbin+= ipf .endif + +.if ${MK_ROUTED} != "no" +CRUNCH_PROGS_sbin+= routed rtquery +.endif + .if ${MK_ZFS} != "no" CRUNCH_PROGS_sbin+= zfs CRUNCH_PROGS_sbin+= zpool Modified: head/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- head/tools/build/mk/OptionalObsoleteFiles.inc Sat Feb 25 03:11:08 2017 (r314239) +++ head/tools/build/mk/OptionalObsoleteFiles.inc Sat Feb 25 03:23:11 2017 (r314240) @@ -1197,6 +1197,7 @@ OLD_FILES+=usr/share/man/man8/casperd.8. .if ${MK_CCD} == no OLD_FILES+=etc/rc.d/ccd +OLD_FILES+=rescue/ccdconfig OLD_FILES+=sbin/ccdconfig OLD_FILES+=usr/share/man/man4/ccd.4.gz OLD_FILES+=usr/share/man/man8/ccdconfig.8.gz @@ -7466,6 +7467,8 @@ OLD_FILES+=usr/share/man/man8/rwhod.8.gz #.endif .if ${MK_ROUTED} == no +OLD_FILES+=rescue/routed +OLD_FILES+=rescue/rtquery OLD_FILES+=sbin/routed OLD_FILES+=sbin/rtquery OLD_FILES+=usr/share/man/man8/routed.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702250323.v1P3NB0G014830>