Author: ngie
Date: Mon Jan 26 06:44:48 2015
New Revision: 277727
URL: https://svnweb.freebsd.org/changeset/base/277727
Log:
Add MK_BHYVE knob for building and installing bhyve(4), et al
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
Added:
head/tools/build/options/WITHOUT_BHYVE (contents, props changed)
Modified:
head/lib/Makefile
head/share/examples/Makefile
head/share/man/man4/Makefile
head/share/mk/src.opts.mk
head/sys/conf/kern.opts.mk
head/sys/modules/Makefile
head/tools/build/mk/OptionalObsoleteFiles.inc
head/usr.sbin/Makefile.amd64
Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile Mon Jan 26 06:29:07 2015 (r277726)
+++ head/lib/Makefile Mon Jan 26 06:44:48 2015 (r277727)
@@ -258,8 +258,10 @@ _librtld_db= librtld_db
.endif
.if ${MACHINE_CPUARCH} == "amd64"
+.if ${MK_BHYVE} != "no"
_libvmmapi= libvmmapi
.endif
+.endif
.if ${MACHINE_CPUARCH} == "mips"
_libproc= libproc
Modified: head/share/examples/Makefile
==============================================================================
--- head/share/examples/Makefile Mon Jan 26 06:29:07 2015
(r277726)
+++ head/share/examples/Makefile Mon Jan 26 06:44:48 2015
(r277727)
@@ -7,7 +7,6 @@
LDIRS= BSD_daemon \
FreeBSD_version \
IPv6 \
- bhyve \
bootforth \
csh \
diskless \
@@ -41,7 +40,6 @@ XFILES= BSD_daemon/FreeBSD.pfa \
FreeBSD_version/Makefile \
FreeBSD_version/README \
IPv6/USAGE \
- bhyve/vmrun.sh \
bootforth/README \
bootforth/boot.4th \
bootforth/frames.4th \
@@ -205,6 +203,13 @@ XFILES+= hast/ucarp.sh \
hast/vip-up.sh
.endif
+.if ${MACHINE_CPUARCH} == "amd64"
+.if ${MK_BHYVE} != "no"
+LDIRS+= bhyve
+XFILES+= bhyve/vmrun.sh
+.endif
+.endif
+
# Define SHARED to indicate whether you want symbolic links to the system
# source (``symlinks''), or a separate copy (``copies''); (latter useful
# in environments where it's not possible to keep /sys publicly readable)
Modified: head/share/man/man4/Makefile
==============================================================================
--- head/share/man/man4/Makefile Mon Jan 26 06:29:07 2015
(r277726)
+++ head/share/man/man4/Makefile Mon Jan 26 06:44:48 2015
(r277727)
@@ -835,7 +835,6 @@ _xnb.4= xnb.4
.endif
.if ${MACHINE_CPUARCH} == "amd64"
-_bhyve.4= bhyve.4
_if_ntb.4= if_ntb.4
_ntb.4= ntb.4
_ntb_hw.4= ntb_hw.4
@@ -848,6 +847,10 @@ MLINKS+=qlxge.4 if_qlxge.4
MLINKS+=qlxgb.4 if_qlxgb.4
MLINKS+=qlxgbe.4 if_qlxgbe.4
MLINKS+=sfxge.4 if_sfxge.4
+
+.if ${MK_BHYVE} != "no"
+_bhyve.4= bhyve.4
+.endif
.endif
.if ${MACHINE_CPUARCH} == "mips"
Modified: head/share/mk/src.opts.mk
==============================================================================
--- head/share/mk/src.opts.mk Mon Jan 26 06:29:07 2015 (r277726)
+++ head/share/mk/src.opts.mk Mon Jan 26 06:44:48 2015 (r277727)
@@ -52,6 +52,7 @@ __DEFAULT_YES_OPTIONS = \
ATM \
AUDIT \
AUTHPF \
+ BHYVE \
BINUTILS \
BINUTILS_BOOTSTRAP \
BLUETOOTH \
Modified: head/sys/conf/kern.opts.mk
==============================================================================
--- head/sys/conf/kern.opts.mk Mon Jan 26 06:29:07 2015 (r277726)
+++ head/sys/conf/kern.opts.mk Mon Jan 26 06:44:48 2015 (r277727)
@@ -23,6 +23,7 @@
# src tree.
__DEFAULT_YES_OPTIONS = \
+ BHYVE \
BLUETOOTH \
CCD \
CDDL \
Modified: head/sys/modules/Makefile
==============================================================================
--- head/sys/modules/Makefile Mon Jan 26 06:29:07 2015 (r277726)
+++ head/sys/modules/Makefile Mon Jan 26 06:44:48 2015 (r277727)
@@ -620,8 +620,11 @@ _qlxge= qlxge
_qlxgb= qlxgb
_qlxgbe= qlxgbe
_sfxge= sfxge
+
+.if ${MK_BHYVE} != "no" || defined(ALL_MODULES)
_vmm= vmm
.endif
+.endif
.if ${MACHINE_CPUARCH} == "i386"
# XXX some of these can move to the general case when de-i386'ed
Modified: head/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 06:29:07
2015 (r277726)
+++ head/tools/build/mk/OptionalObsoleteFiles.inc Mon Jan 26 06:44:48
2015 (r277727)
@@ -144,6 +144,16 @@ OLD_FILES+=usr/share/man/man8/authpf.8.g
OLD_FILES+=usr/share/man/man8/authpf-noip.8.gz
.endif
+.if ${MK_BHYVE} == no
+OLD_FILES+=usr/sbin/bhyve
+OLD_FILES+=usr/sbin/bhyvectl
+OLD_FILES+=usr/sbin/bhyveload
+OLD_FILES+=usr/share/examples/bhyve/vmrun.sh
+OLD_FILES+=usr/share/man/man8/bhyve.8.gz
+OLD_FILES+=usr/share/man/man8/bhyveload.8.gz
+OLD_DIRS+=usr/share/examples/bhyve
+.endif
+
.if ${MK_BLUETOOTH} == no
OLD_FILES+=etc/bluetooth/hcsecd.conf
OLD_FILES+=etc/bluetooth/hosts
Added: head/tools/build/options/WITHOUT_BHYVE
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tools/build/options/WITHOUT_BHYVE Mon Jan 26 06:44:48 2015
(r277727)
@@ -0,0 +1,6 @@
+.\" $FreeBSD$
+Set to not build or install
+.Xr bhyve 8 ,
+associated utilities, and examples.
+.Pp
+This option only affects amd64/amd64.
Modified: head/usr.sbin/Makefile.amd64
==============================================================================
--- head/usr.sbin/Makefile.amd64 Mon Jan 26 06:29:07 2015
(r277726)
+++ head/usr.sbin/Makefile.amd64 Mon Jan 26 06:44:48 2015
(r277727)
@@ -10,9 +10,11 @@ SUBDIR+= acpi
SUBDIR+= apm
.endif
SUBDIR+= asf
+.if ${MK_BHYVE} != "no"
SUBDIR+= bhyve
SUBDIR+= bhyvectl
SUBDIR+= bhyveload
+.endif
SUBDIR+= boot0cfg
.if ${MK_TOOLCHAIN} != "no"
SUBDIR+= btxld
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
