From owner-svn-src-projects@FreeBSD.ORG Tue Nov 25 19:20:27 2014 Return-Path: Delivered-To: svn-src-projects@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 A3EBB542; Tue, 25 Nov 2014 19:20:27 +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 854ABA08; Tue, 25 Nov 2014 19:20:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sAPJKRkp032018; Tue, 25 Nov 2014 19:20:27 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sAPJKP9q032007; Tue, 25 Nov 2014 19:20:25 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201411251920.sAPJKP9q032007@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Tue, 25 Nov 2014 19:20:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275067 - in projects/building-blocks: share/examples share/man/man4 share/mk tools/build/mk tools/build/options usr.sbin X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Nov 2014 19:20:27 -0000 Author: ngie Date: Tue Nov 25 19:20:25 2014 New Revision: 275067 URL: https://svnweb.freebsd.org/changeset/base/275067 Log: Make building/installing bhyve optional via MK_BHYVE on amd64 Disable building/installing bhyve from src.opts.mk on unsupported architectures (!amd64) Added: projects/building-blocks/tools/build/options/WITHOUT_BHYVE (contents, props changed) projects/building-blocks/tools/build/options/WITH_BHYVE (contents, props changed) Modified: projects/building-blocks/share/examples/Makefile projects/building-blocks/share/man/man4/Makefile projects/building-blocks/share/mk/src.opts.mk projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc projects/building-blocks/usr.sbin/Makefile.amd64 Modified: projects/building-blocks/share/examples/Makefile ============================================================================== --- projects/building-blocks/share/examples/Makefile Tue Nov 25 19:17:12 2014 (r275066) +++ projects/building-blocks/share/examples/Makefile Tue Nov 25 19:20:25 2014 (r275067) @@ -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 Modified: projects/building-blocks/share/man/man4/Makefile ============================================================================== --- projects/building-blocks/share/man/man4/Makefile Tue Nov 25 19:17:12 2014 (r275066) +++ projects/building-blocks/share/man/man4/Makefile Tue Nov 25 19:20:25 2014 (r275067) @@ -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 Modified: projects/building-blocks/share/mk/src.opts.mk ============================================================================== --- projects/building-blocks/share/mk/src.opts.mk Tue Nov 25 19:17:12 2014 (r275066) +++ projects/building-blocks/share/mk/src.opts.mk Tue Nov 25 19:20:25 2014 (r275067) @@ -212,6 +212,13 @@ __DEFAULT_NO_OPTIONS+=CLANG_IS_CC CLANG __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 Modified: projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Nov 25 19:17:12 2014 (r275066) +++ projects/building-blocks/tools/build/mk/OptionalObsoleteFiles.inc Tue Nov 25 19:20:25 2014 (r275067) @@ -144,6 +144,14 @@ 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/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 Added: projects/building-blocks/tools/build/options/WITHOUT_BHYVE ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITHOUT_BHYVE Tue Nov 25 19:20:25 2014 (r275067) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build or install +.Xr bhyve 8 , +associated utilities, and examples. Added: projects/building-blocks/tools/build/options/WITH_BHYVE ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/building-blocks/tools/build/options/WITH_BHYVE Tue Nov 25 19:20:25 2014 (r275067) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to build and install +.Xr bhyve 8 , +associated utilities, and examples. Modified: projects/building-blocks/usr.sbin/Makefile.amd64 ============================================================================== --- projects/building-blocks/usr.sbin/Makefile.amd64 Tue Nov 25 19:17:12 2014 (r275066) +++ projects/building-blocks/usr.sbin/Makefile.amd64 Tue Nov 25 19:20:25 2014 (r275067) @@ -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