From 6c95dc000e97d2e3088b955e57d654866b314705 Mon Sep 17 00:00:00 2001 From: ngie Date: Fri, 13 Feb 2015 21:25:56 +0000 Subject: [PATCH] MFC r278713: r278713: MFC r277677: r277677: Add MK_BSDINSTALL knob for building and installing bsdinstall Sponsored by: EMC / Isilon Storage Division git-svn-id: svn://svn.freebsd.org/base/stable/9@278714 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- share/mk/bsd.own.mk | 1 + tools/build/mk/OptionalObsoleteFiles.inc | 33 ++++++++++++++++++++++++ tools/build/options/WITHOUT_BSDINSTALL | 5 ++++ usr.sbin/Makefile | 5 +++- 4 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 tools/build/options/WITHOUT_BSDINSTALL diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index 800e86251..d4a42dca7 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -344,6 +344,7 @@ __DEFAULT_YES_OPTIONS = \ BLUETOOTH \ BOOT \ BSD_CPIO \ + BSDINSTALL \ BSNMP \ SOURCELESS \ SOURCELESS_HOST \ diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 971042482..479c8e518 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -568,6 +568,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 diff --git a/tools/build/options/WITHOUT_BSDINSTALL b/tools/build/options/WITHOUT_BSDINSTALL new file mode 100644 index 000000000..8aaf2a654 --- /dev/null +++ b/tools/build/options/WITHOUT_BSDINSTALL @@ -0,0 +1,5 @@ +.\" $FreeBSD$ +Set to not build +.Xr bsdinstall 8 , +.Xr sade 8 , +and related programs. diff --git a/usr.sbin/Makefile b/usr.sbin/Makefile index 294866b05..5ceb56c65 100644 --- a/usr.sbin/Makefile +++ b/usr.sbin/Makefile @@ -8,7 +8,6 @@ SUBDIR= adduser \ bootparamd \ burncd \ bsdconfig \ - bsdinstall \ cdcontrol \ chkgrp \ chown \ @@ -150,6 +149,10 @@ SUBDIR+= rndc-confgen SUBDIR+= bluetooth .endif +.if ${MK_BSDINSTALL} != "no" +SUBDIR+= bsdinstall +.endif + .if ${MK_BSNMP} != "no" SUBDIR+= bsnmpd .endif -- 2.45.0