From patchwork Mon Mar 14 17:55:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 8582821 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3091B9F6E1 for ; Mon, 14 Mar 2016 18:01:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 48EE22013D for ; Mon, 14 Mar 2016 18:01:23 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 4CB982015E for ; Mon, 14 Mar 2016 18:01:22 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1afWlS-00063c-31; Mon, 14 Mar 2016 17:58:46 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1afWlQ-00061n-S5 for xen-devel@lists.xen.org; Mon, 14 Mar 2016 17:58:44 +0000 Received: from [193.109.254.147] by server-4.bemta-14.messagelabs.com id 19/D4-03301-4DBF6E65; Mon, 14 Mar 2016 17:58:44 +0000 X-Env-Sender: prvs=874c279eb=anthony.perard@citrix.com X-Msg-Ref: server-10.tower-27.messagelabs.com!1457978321!31105319!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.11; banners=-,-,- X-VirusChecked: Checked Received: (qmail 49422 invoked from network); 14 Mar 2016 17:58:43 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-10.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 14 Mar 2016 17:58:43 -0000 X-IronPort-AV: E=Sophos;i="5.24,336,1454976000"; d="scan'208";a="338808749" From: Anthony PERARD To: Date: Mon, 14 Mar 2016 17:55:49 +0000 Message-ID: <1457978150-27201-15-git-send-email-anthony.perard@citrix.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1457978150-27201-1-git-send-email-anthony.perard@citrix.com> References: <1457978150-27201-1-git-send-email-anthony.perard@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Anthony PERARD , Wei Liu , Ian Jackson , Stefano Stabellini Subject: [Xen-devel] [PATCH v4 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-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ... to compile SeaBIOS and OVMF. Only depends 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 --- Change in V4: - change subject prefix Please, run ./autogen.sh on this patch. --- 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 7e5452e..ef306ae 100644 --- a/tools/configure.ac +++ b/tools/configure.ac @@ -212,12 +212,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/seabios.bin}"], [SeaBIOS path]) @@ -226,12 +227,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 6a37758..4975cb4 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 @@ -49,15 +45,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_ROM) $(INST_DIR)/seabios.bin endif -endif ifeq ($(CONFIG_OVMF),y) -ifeq ($(OVMF_PATH),) $(INSTALL_DATA) $(OVMF_ROM) $(INST_DIR)/ovmf.bin endif -endif .PHONY: clean clean: subdirs-clean