d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add MK_BHYVE knob for building and installing bhyve(4), et al

Browse Source 
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
This commit is contained in:
Enji Cooper 2015-01-26 06:44:48 +00:00
parent c01f300b7f
commit 02629e469f
9 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Makefile
View File

@ -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

9
share/examples/Makefile
View File

@ -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)

5
share/man/man4/Makefile
View File

@ -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"

1
share/mk/src.opts.mk
View File

@ -52,6 +52,7 @@ __DEFAULT_YES_OPTIONS = \
ATM \
AUDIT \
AUTHPF \
BHYVE \
BINUTILS \
BINUTILS_BOOTSTRAP \
BLUETOOTH \

1
sys/conf/kern.opts.mk
View File

@ -23,6 +23,7 @@
# src tree.
__DEFAULT_YES_OPTIONS = \
BHYVE \
BLUETOOTH \
CCD \
CDDL \

3
sys/modules/Makefile
View File

@ -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

10
tools/build/mk/OptionalObsoleteFiles.inc
View File

@ -144,6 +144,16 @@ OLD_FILES+=usr/share/man/man8/authpf.8.gz
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

6
tools/build/options/WITHOUT_BHYVE Normal file
View File

@ -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.

2
usr.sbin/Makefile.amd64
View File

@ -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