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

Make building/installing bhyve optional via MK_BHYVE on amd64

Browse Source 
Disable building/installing bhyve from src.opts.mk on unsupported
architectures (!amd64)
This commit is contained in:
Enji Cooper 2014-11-25 19:20:25 +00:00
parent c341279404
commit 4be1ca354c
7 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
share/examples/Makefile
View File

@ -7,7 +7,6 @@
LDIRS= BSD_daemon \
FreeBSD_version \
IPv6 \
bhyve \
bootforth \
csh \
diskless \
@ -42,7 +41,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 \
@ -207,6 +205,11 @@ NO_OBJ=
# in environments where it's not possible to keep /sys publicly readable)
SHARED?= copies
.if ${MK_BHYVE} != "no"
LDIRS+= bhyve
XFILES+= bhyve/vmrun.sh
.endif
beforeinstall: ${SHARED} etc-examples
.ORDER: ${SHARED} etc-examples

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
@ -858,6 +857,10 @@ _nvram2env.4= nvram2env.4
SUBDIR= man4.${MACHINE_CPUARCH}
.endif
.if ${MK_BHYVE} != "no"
_bhyve.4= bhyve.4
.endif
.if ${MK_TESTS} != "no"
ATF= ${.CURDIR}/../../../contrib/atf
.PATH: ${ATF}/doc

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

@ -212,6 +212,13 @@ __DEFAULT_NO_OPTIONS+=CLANG_IS_CC CLANG CLANG_BOOTSTRAP
__DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
.endif
# bhyve is only supported on amd64
.if ${__T} == "amd64"
__DEFAULT_YES_OPTIONS+=BHYVE
.else
MK_BHYVE:= no
.endif
# hyperv is only supported on amd64 and i386/i386
.if ${__T} == "amd64" || (${__T} == "i386" && ${__TT} == "i386")
__DEFAULT_YES_OPTIONS+=HYPERV

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

@ -144,6 +144,14 @@ 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/man/man8/bhyve.8.gz
OLD_FILES+=usr/share/man/man8/bhyveload.8.gz
.endif
.if ${MK_BLUETOOTH} == no
OLD_FILES+=etc/bluetooth/hcsecd.conf
OLD_FILES+=etc/bluetooth/hosts

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

@ -0,0 +1,4 @@
.\" $FreeBSD$
Set to not build or install
.Xr bhyve 8 ,
associated utilities, and examples.

4
tools/build/options/WITH_BHYVE Normal file
View File

@ -0,0 +1,4 @@
.\" $FreeBSD$
Set to build and install
.Xr bhyve 8 ,
associated utilities, and examples.

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