>Number: 178210
>Category: conf
>Synopsis: [PATCH] make bsdinstall optional
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sat Apr 27 22:40:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Garrett Cooper
>Release: 10-CURRENT
>Organization:
EMC Isilon
>Environment:
FreeBSD fuji-current.local 10.0-CURRENT FreeBSD 10.0-CURRENT #1 r+eabe039: Wed
Apr 24 09:56:41 PDT 2013 [email protected]:/usr/obj/usr/src/sys/FUJI
i386
>Description:
The attached patch makes bsdinstall optional via WITH{OUT}_BSDINSTALL
>How-To-Repeat:
>Fix:
Patch attached with submission follows:
Index: share/mk/bsd.own.mk
===================================================================
--- share/mk/bsd.own.mk (revision 249996)
+++ share/mk/bsd.own.mk (working copy)
@@ -252,6 +252,7 @@
BINUTILS \
BLUETOOTH \
BOOT \
+ BSDINSTALL \
BSD_CPIO \
BSNMP \
BZIP2 \
Index: tools/build/mk/OptionalObsoleteFiles.inc
===================================================================
--- tools/build/mk/OptionalObsoleteFiles.inc (revision 249996)
+++ tools/build/mk/OptionalObsoleteFiles.inc (working copy)
@@ -536,6 +536,37 @@
# to be filled in
#.endif
+.if ${MK_BSDINSTALL} == no
+OLD_DIRS+=usr/libexec/bsdinstall
+OLD_FILES+=usr/libexec/bsdinstall/distextract
+OLD_FILES+=usr/libexec/bsdinstall/distfetch
+OLD_FILES+=usr/libexec/bsdinstall/partedit
+OLD_FILES+=usr/libexec/bsdinstall/auto
+OLD_FILES+=usr/libexec/bsdinstall/autopart
+OLD_FILES+=usr/libexec/bsdinstall/adduser
+OLD_FILES+=usr/libexec/bsdinstall/checksum
+OLD_FILES+=usr/libexec/bsdinstall/config
+OLD_FILES+=usr/libexec/bsdinstall/docsinstall
+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/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/sbin/bsdinstall
+OLD_FILES+=usr/share/man/man8/bsdinstall.8.gz
+OLD_FILES+=usr/share/man/man8/sade.8.gz
+.endif
+
.if ${MK_CALENDAR} == no
OLD_FILES+=etc/periodic/daily/300.calendar
OLD_FILES+=usr/bin/calendar
Index: tools/build/options/WITHOUT_BSDINSTALL
===================================================================
--- tools/build/options/WITHOUT_BSDINSTALL (revision 0)
+++ tools/build/options/WITHOUT_BSDINSTALL (working copy)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to install bsdinstall(8), FreeBSD installer.
Index: usr.sbin/Makefile
===================================================================
--- usr.sbin/Makefile (revision 249996)
+++ usr.sbin/Makefile (working copy)
@@ -6,7 +6,6 @@
SUBDIR= adduser \
arp \
bootparamd \
- bsdinstall \
cdcontrol \
chkgrp \
chown \
@@ -151,6 +150,10 @@
SUBDIR+= sysrc
.endif
+.if ${MK_BSDINSTALL} != "no"
+SUBDIR+= bsdinstall
+.endif
+
.if ${MK_BSNMP} != "no"
SUBDIR+= bsnmpd
.endif
>Release-Note:
>Audit-Trail:
>Unformatted:
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-bugs
To unsubscribe, send any mail to "[email protected]"
