svn commit: r278713 - in stable/10: share/mk tools/build/mk tools/build/options usr.sbin

[Garrett Cooper]

Author: ngie
Date: Fri Feb 13 21:24:32 2015
New Revision: 278713
URL: https://svnweb.freebsd.org/changeset/base/278713

Log:
  MFC r277677:
  
  r277677:
  
    Add MK_BSDINSTALL knob for building and installing bsdinstall
  
    Sponsored by: EMC / Isilon Storage Division

Added:
  stable/10/tools/build/options/WITHOUT_BSDINSTALL
     - copied unchanged from r277677, head/tools/build/options/WITHOUT_BSDINSTALL
Modified:
  stable/10/share/mk/bsd.own.mk
  stable/10/tools/build/mk/OptionalObsoleteFiles.inc
  stable/10/usr.sbin/Makefile
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/mk/bsd.own.mk
==============================================================================
--- stable/10/share/mk/bsd.own.mk	Fri Feb 13 21:21:51 2015	(r278712)
+++ stable/10/share/mk/bsd.own.mk	Fri Feb 13 21:24:32 2015	(r278713)
@@ -261,6 +261,7 @@ __DEFAULT_YES_OPTIONS = \
     BMAKE \
     BOOT \
     BSD_CPIO \
+    BSDINSTALL \
     BSNMP \
     BZIP2 \
     CALENDAR \

Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Fri Feb 13 21:21:51 2015	(r278712)
+++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc	Fri Feb 13 21:24:32 2015	(r278713)
@@ -399,6 +399,39 @@ OLD_DIRS+=usr/share/snmp/defs
 OLD_DIRS+=usr/share/snmp/mibs
 .endif
 
+.if ${MK_BSDINSTALL} == no
+OLD_FILES+=usr/libexec/bsdinstall/adduser
+OLD_FILES+=usr/libexec/bsdinstall/auto
+OLD_FILES+=usr/libexec/bsdinstall/autopart
+OLD_FILES+=usr/libexec/bsdinstall/checksum
+OLD_FILES+=usr/libexec/bsdinstall/config
+OLD_FILES+=usr/libexec/bsdinstall/distextract
+OLD_FILES+=usr/libexec/bsdinstall/distfetch
+OLD_FILES+=usr/libexec/bsdinstall/docsinstall
+OLD_FILES+=usr/libexec/bsdinstall/entropy
+OLD_FILES+=usr/libexec/bsdinstall/hostname
+OLD_FILES+=usr/libexec/bsdinstall/jail
+OLD_FILES+=usr/libexec/bsdinstall/keymap
+OLD_FILES+=usr/libexec/bsdinstall/mirrorselect
+OLD_FILES+=usr/libexec/bsdinstall/mount
+OLD_FILES+=usr/libexec/bsdinstall/netconfig
+OLD_FILES+=usr/libexec/bsdinstall/netconfig_ipv4
+OLD_FILES+=usr/libexec/bsdinstall/netconfig_ipv6
+OLD_FILES+=usr/libexec/bsdinstall/partedit
+OLD_FILES+=usr/libexec/bsdinstall/rootpass
+OLD_FILES+=usr/libexec/bsdinstall/script
+OLD_FILES+=usr/libexec/bsdinstall/scriptedpart
+OLD_FILES+=usr/libexec/bsdinstall/services
+OLD_FILES+=usr/libexec/bsdinstall/time
+OLD_FILES+=usr/libexec/bsdinstall/umount
+OLD_FILES+=usr/libexec/bsdinstall/wlanconfig
+OLD_FILES+=usr/libexec/bsdinstall/zfsboot
+OLD_FILES+=usr/sbin/bsdinstall
+OLD_FILES+=usr/share/man/man8/bsdinstall.8.gz
+OLD_FILES+=usr/share/man/man8/sade.8.gz
+OLD_DIRS+=usr/libexec/bsdinstall
+.endif
+
 .if ${MK_CALENDAR} == no
 OLD_FILES+=etc/periodic/daily/300.calendar
 OLD_FILES+=usr/bin/calendar

Copied: stable/10/tools/build/options/WITHOUT_BSDINSTALL (from r277677, head/tools/build/options/WITHOUT_BSDINSTALL)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ stable/10/tools/build/options/WITHOUT_BSDINSTALL	Fri Feb 13 21:24:32 2015	(r278713, copy of r277677, head/tools/build/options/WITHOUT_BSDINSTALL)
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build
+.Xr bsdinstall 8 ,
+.Xr sade 8 ,
+and related programs.

Modified: stable/10/usr.sbin/Makefile
==============================================================================
--- stable/10/usr.sbin/Makefile	Fri Feb 13 21:21:51 2015	(r278712)
+++ stable/10/usr.sbin/Makefile	Fri Feb 13 21:24:32 2015	(r278713)
@@ -8,7 +8,6 @@ SUBDIR=	adduser \
 	binmiscctl \
 	bootparamd \
 	bsdconfig \
-	bsdinstall \
 	cdcontrol \
 	chkgrp \
 	chown \
@@ -132,6 +131,10 @@ SUBDIR+=	autofs
 SUBDIR+=	bluetooth
 .endif
 
+.if ${MK_BSDINSTALL} != "no"
+SUBDIR+=	bsdinstall
+.endif
+
 .if ${MK_BSNMP} != "no"
 SUBDIR+=	bsnmpd
 .endif