diff options
| author | ngie <ngie@FreeBSD.org> | 2015-01-26 06:44:48 +0000 |
|---|---|---|
| committer | ngie <ngie@FreeBSD.org> | 2015-01-26 06:44:48 +0000 |
| commit | 691728766995189ba0ea8b9795f271eb5008ac8e (patch) | |
| tree | dabcdafc594d6b1c9c606ebb82c9afe0fd211c01 /share | |
| parent | 87621b19597ca44bd742e885dda35c26848bbe6d (diff) | |
| download | FreeBSD-src-691728766995189ba0ea8b9795f271eb5008ac8e.zip FreeBSD-src-691728766995189ba0ea8b9795f271eb5008ac8e.tar.gz | |
Add MK_BHYVE knob for building and installing bhyve(4), et al
MFC after: 2 weeks
Sponsored by: EMC / Isilon Storage Division
Diffstat (limited to 'share')
| -rw-r--r-- | share/examples/Makefile | 9 | ||||
| -rw-r--r-- | share/man/man4/Makefile | 5 | ||||
| -rw-r--r-- | share/mk/src.opts.mk | 1 |
3 files changed, 12 insertions, 3 deletions
diff --git a/share/examples/Makefile b/share/examples/Makefile index 0765a43..7e0576c 100644 --- a/share/examples/Makefile +++ b/share/examples/Makefile @@ -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) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 8bfd875..afdd16e 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -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" diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk index 63dcb1bd..c8c42be 100644 --- a/share/mk/src.opts.mk +++ b/share/mk/src.opts.mk @@ -52,6 +52,7 @@ __DEFAULT_YES_OPTIONS = \ ATM \ AUDIT \ AUTHPF \ + BHYVE \ BINUTILS \ BINUTILS_BOOTSTRAP \ BLUETOOTH \ |
