From owner-svn-src-stable-10@FreeBSD.ORG Wed Feb 11 07:21:19 2015 Return-Path: Delivered-To: svn-src-stable-10@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B011AAE0; Wed, 11 Feb 2015 07:21:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 90CB6335; Wed, 11 Feb 2015 07:21:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1B7LJNI014082; Wed, 11 Feb 2015 07:21:19 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1B7LHQj014072; Wed, 11 Feb 2015 07:21:17 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201502110721.t1B7LHQj014072@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Wed, 11 Feb 2015 07:21:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r278557 - in stable/10: lib share/examples share/man/man4 share/mk sys/modules tools/build/mk tools/build/options usr.sbin X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-10@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 10-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Feb 2015 07:21:19 -0000 Author: ngie Date: Wed Feb 11 07:21:16 2015 New Revision: 278557 URL: https://svnweb.freebsd.org/changeset/base/278557 Log: MFC r277727: r277727: Add MK_BHYVE knob for building and installing bhyve(4), et al Sponsored by: EMC / Isilon Storage Division Added: stable/10/tools/build/options/WITHOUT_BHYVE - copied unchanged from r277727, head/tools/build/options/WITHOUT_BHYVE Modified: stable/10/lib/Makefile stable/10/share/examples/Makefile stable/10/share/man/man4/Makefile stable/10/share/mk/bsd.own.mk stable/10/sys/modules/Makefile stable/10/tools/build/mk/OptionalObsoleteFiles.inc stable/10/usr.sbin/Makefile.amd64 Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/Makefile ============================================================================== --- stable/10/lib/Makefile Wed Feb 11 07:12:00 2015 (r278556) +++ stable/10/lib/Makefile Wed Feb 11 07:21:16 2015 (r278557) @@ -225,8 +225,10 @@ _librtld_db= librtld_db .endif .if ${MACHINE_CPUARCH} == "amd64" +.if ${MK_BHYVE} != "no" _libvmmapi= libvmmapi .endif +.endif .if ${MACHINE_CPUARCH} == "ia64" _libefi= libefi Modified: stable/10/share/examples/Makefile ============================================================================== --- stable/10/share/examples/Makefile Wed Feb 11 07:12:00 2015 (r278556) +++ stable/10/share/examples/Makefile Wed Feb 11 07:21:16 2015 (r278557) @@ -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: stable/10/share/man/man4/Makefile ============================================================================== --- stable/10/share/man/man4/Makefile Wed Feb 11 07:12:00 2015 (r278556) +++ stable/10/share/man/man4/Makefile Wed Feb 11 07:21:16 2015 (r278557) @@ -836,7 +836,6 @@ MLINKS+=lindev.4 full.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 @@ -849,6 +848,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: stable/10/share/mk/bsd.own.mk ============================================================================== --- stable/10/share/mk/bsd.own.mk Wed Feb 11 07:12:00 2015 (r278556) +++ stable/10/share/mk/bsd.own.mk Wed Feb 11 07:21:16 2015 (r278557) @@ -254,6 +254,7 @@ __DEFAULT_YES_OPTIONS = \ ATM \ AUDIT \ AUTHPF \ + BHYVE \ BINUTILS \ BLUETOOTH \ BMAKE \ Modified: stable/10/sys/modules/Makefile ============================================================================== --- stable/10/sys/modules/Makefile Wed Feb 11 07:12:00 2015 (r278556) +++ stable/10/sys/modules/Makefile Wed Feb 11 07:21:16 2015 (r278557) @@ -774,7 +774,9 @@ _twa= twa _vesa= vesa _viawd= viawd _virtio= virtio +.if ${MK_BHYVE} != "no" || defined(ALL_MODULES) _vmm= vmm +.endif _vxge= vxge _x86bios= x86bios _wbwd= wbwd Modified: stable/10/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 11 07:12:00 2015 (r278556) +++ stable/10/tools/build/mk/OptionalObsoleteFiles.inc Wed Feb 11 07:21:16 2015 (r278557) @@ -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 Copied: stable/10/tools/build/options/WITHOUT_BHYVE (from r277727, head/tools/build/options/WITHOUT_BHYVE) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/10/tools/build/options/WITHOUT_BHYVE Wed Feb 11 07:21:16 2015 (r278557, copy of r277727, head/tools/build/options/WITHOUT_BHYVE) @@ -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: stable/10/usr.sbin/Makefile.amd64 ============================================================================== --- stable/10/usr.sbin/Makefile.amd64 Wed Feb 11 07:12:00 2015 (r278556) +++ stable/10/usr.sbin/Makefile.amd64 Wed Feb 11 07:21:16 2015 (r278557) @@ -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