svn commit: r275016 - in projects/building-blocks: share/mk tools/build/mk tools/build/options usr.sbin

[Garrett Cooper]

Author: ngie
Date: Tue Nov 25 07:30:26 2014
New Revision: 275016
URL: https://svnweb.freebsd.org/changeset/base/275016

Log:
  Make bsdinstall(8) and sade(8) optional components via MK_BSDINSTALL=yes

Added:
  projects/building-blocks/tools/build/options/WITHOUT_BSDINSTALL   (contents, props changed)
Modified:
  projects/building-blocks/share/mk/src.opts.mk
  projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
  projects/building-blocks/usr.sbin/Makefile

Modified: projects/building-blocks/share/mk/src.opts.mk
==============================================================================
--- projects/building-blocks/share/mk/src.opts.mk	Tue Nov 25 07:14:16 2014	(r275015)
+++ projects/building-blocks/share/mk/src.opts.mk	Tue Nov 25 07:30:26 2014	(r275016)
@@ -57,6 +57,7 @@ __DEFAULT_YES_OPTIONS = \
     BLUETOOTH \
     BOOT \
     BSD_CPIO \
+    BSDINSTALL \
     BSNMP \
     BZIP2 \
     CALENDAR \

Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Tue Nov 25 07:14:16 2014	(r275015)
+++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc	Tue Nov 25 07:30:26 2014	(r275016)
@@ -274,6 +274,39 @@ OLD_FILES+=usr/share/man/man8/sdpd.8.gz
 # to be filled in
 #.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

Added: projects/building-blocks/tools/build/options/WITHOUT_BSDINSTALL
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ projects/building-blocks/tools/build/options/WITHOUT_BSDINSTALL	Tue Nov 25 07:30:26 2014	(r275016)
@@ -0,0 +1,5 @@
+.\" $FreeBSD$
+Set to not build
+.Xr bsdinstall 8 ,
+.Xr sade 8 ,
+and related programs.

Modified: projects/building-blocks/usr.sbin/Makefile
==============================================================================
--- projects/building-blocks/usr.sbin/Makefile	Tue Nov 25 07:14:16 2014	(r275015)
+++ projects/building-blocks/usr.sbin/Makefile	Tue Nov 25 07:30:26 2014	(r275016)
@@ -9,7 +9,6 @@ SUBDIR=	adduser \
 	binmiscctl \
 	bootparamd \
 	bsdconfig \
-	bsdinstall \
 	cdcontrol \
 	chkgrp \
 	chown \
@@ -128,6 +127,10 @@ SUBDIR+=	authpf
 SUBDIR+=	bluetooth
 .endif
 
+.if ${MK_BSDINSTALL} != "no"
+SUBDIR+=	bsdinstall
+.endif
+
 .if ${MK_BSNMP} != "no"
 SUBDIR+=	bsnmpd
 .endif