From patchwork Wed Jun 22 17:15:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 9193421 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8F2036075C for ; Wed, 22 Jun 2016 17:48:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8479C28400 for ; Wed, 22 Jun 2016 17:48:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 78F2928413; Wed, 22 Jun 2016 17:48:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D1A1628400 for ; Wed, 22 Jun 2016 17:48:26 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFmEJ-0007uw-LG; Wed, 22 Jun 2016 17:46:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFmEI-0007u2-6Y for xen-devel@lists.xen.org; Wed, 22 Jun 2016 17:46:22 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 13/A8-18304-DEECA675; Wed, 22 Jun 2016 17:46:21 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRWlGSWpSXmKPExsXitHSDve6bc1n hBtueWFks+biYxYHR4+ju30wBjFGsmXlJ+RUJrBmr931mLegWrdi26ytLA+NkwS5GTg4JAX+J 7mOfWUFsNgEDiRXTrzKC2CICshKru+awdzFycDALlEscPaYLEhYWCJY49XgLC4jNIqAq8f/zT LBWXgE7iSUfr7BBjJSTaDh/nxnE5gSKL3vVAxYXErCVuL1gASOErSZxY+EyFoheQYmTM5+A2c wCEhIHX7xghpjDLXH79FTmCYx8s5CUzUJStoCRaRWjRnFqUVlqka6hqV5SUWZ6RkluYmaOrqG BsV5uanFxYnpqTmJSsV5yfu4mRmBIMQDBDsY12z0PMUpyMCmJ8jJuywoX4kvKT6nMSCzOiC8q zUktPsQow8GhJMF77SxQTrAoNT21Ii0zBxjcMGkJDh4lEV4xYIAL8RYXJOYWZ6ZDpE4xKkqJ8 34D6RMASWSU5sG1wSLqEqOslDAvI9AhQjwFqUW5mSWo8q8YxTkYlYR5H4NM4cnMK4Gb/gpoMR PQ4mX96SCLSxIRUlINjFYLagr2r/91K0njtO5bJsnEl1O9Nj7dN3edwO5M96JL+hpiFacOeb/ O21l9cUb3zln/ZSs7bwi5/RT46yTF9ynj4tFfdWpFT5QYJlXnBdmunlo3dev5rDcncvP+3y6+ qN9iGCjQ1fyuXfDy8y+WUl/ZTijFbHltqyr051Do2bWZ5gf2Wl3/GaHEUpyRaKjFXFScCABGJ bgwowIAAA== X-Env-Sender: prvs=9742ee4c2=anthony.perard@citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1466617578!43535765!2 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 620 invoked from network); 22 Jun 2016 17:46:20 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-5.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 22 Jun 2016 17:46:20 -0000 X-IronPort-AV: E=Sophos;i="5.26,509,1459814400"; d="scan'208";a="369024779" From: Anthony PERARD To: Date: Wed, 22 Jun 2016 18:15:45 +0100 Message-ID: <20160622171545.5304-15-anthony.perard@citrix.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160622171545.5304-1-anthony.perard@citrix.com> References: <20160622171545.5304-1-anthony.perard@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Anthony PERARD , Wei Liu , Ian Jackson Subject: [Xen-devel] [PATCH v5 14/14] configure: do not depend on SEABIOS_PATH or OVMF_PATH ... X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP ... to compile SeaBIOS and OVMF. Only depend on CONFIG_*. If --with-system-* configure option is used, then set *_CONFIG=n to not compile SEABIOS and OVMF. Signed-off-by: Anthony PERARD Reviewed-by: Konrad Rzeszutek Wilk Acked-by: Wei Liu --- Please, run ./autogen.sh on this patch. No change in V5. Change in V4: - change subject prefix --- tools/configure.ac | 6 ++++-- tools/firmware/Makefile | 8 -------- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/tools/configure.ac b/tools/configure.ac index 4f75fae..19279a6 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -214,12 +214,13 @@ AC_ARG_WITH([system-seabios], AS_HELP_STRING([--with-system-seabios@<:@=PATH@:>@], [Use system supplied seabios PATH instead of building and installing our own version]),[ + # Disable compilation of SeaBIOS. + seabios=n case $withval in no) seabios_path= ;; *) seabios_path=$withval ;; esac ],[]) -AC_SUBST(seabios_path) AC_DEFINE_UNQUOTED([SEABIOS_PATH], ["${seabios_path:-$XENFIRMWAREDIR/bios.bin}"], [SeaBIOS path]) @@ -228,12 +229,13 @@ AC_ARG_WITH([system-ovmf], AS_HELP_STRING([--with-system-ovmf@<:@=PATH@:>@], [Use system supplied OVMF PATH instead of building and installing our own version]),[ + # Disable compilation of OVMF. + ovmf=n case $withval in no) ovmf_path= ;; *) ovmf_path=$withval ;; esac ],[]) -AC_SUBST(ovmf_path) AC_DEFINE_UNQUOTED([OVMF_PATH], ["${ovmf_path:-$XENFIRMWAREDIR/ovmf.bin}"], [OVMF path]) diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile index 82b1f6b..cf09ad2 100644 --- a/tools/firmware/Makefile +++ b/tools/firmware/Makefile @@ -6,12 +6,8 @@ TARGET := hvmloader/hvmloader INST_DIR := $(DESTDIR)$(XENFIRMWAREDIR) SUBDIRS-y := -ifeq ($(OVMF_PATH),) SUBDIRS-$(CONFIG_OVMF) += ovmf-dir -endif -ifeq ($(SEABIOS_PATH),) SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir -endif SUBDIRS-$(CONFIG_ROMBIOS) += rombios SUBDIRS-$(CONFIG_ROMBIOS) += vgabios SUBDIRS-$(CONFIG_ROMBIOS) += etherboot @@ -46,15 +42,11 @@ install: all [ -d $(INST_DIR) ] || $(INSTALL_DIR) $(INST_DIR) [ ! -e $(TARGET) ] || $(INSTALL_DATA) $(TARGET) $(INST_DIR) ifeq ($(CONFIG_SEABIOS),y) -ifeq ($(SEABIOS_PATH),) $(INSTALL_DATA) seabios-dir/out/bios.bin $(INST_DIR)/bios.bin endif -endif ifeq ($(CONFIG_OVMF),y) -ifeq ($(OVMF_PATH),) $(INSTALL_DATA) ovmf-dir/ovmf.bin $(INST_DIR)/ovmf.bin endif -endif .PHONY: clean clean: subdirs-clean