From patchwork Tue Jul 12 14:42:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 9225559 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 A14626086B for ; Tue, 12 Jul 2016 14:51:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 90F3A27C14 for ; Tue, 12 Jul 2016 14:51:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 832F927E78; Tue, 12 Jul 2016 14:51:26 +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 F23CD27C14 for ; Tue, 12 Jul 2016 14:51:25 +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 1bMyzs-0005Pk-R9; Tue, 12 Jul 2016 14:49:16 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bMyzs-0005Og-6K for xen-devel@lists.xen.org; Tue, 12 Jul 2016 14:49:16 +0000 Received: from [85.158.139.211] by server-7.bemta-5.messagelabs.com id BD/02-10476-B6305875; Tue, 12 Jul 2016 14:49:15 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRWlGSWpSXmKPExsXitHRDpG42c2u 4wZFTzBZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8ayDX+YCrpFKz7fe8zUwDhZsIuRk0NCwF/i yq6JjCA2m4CBxIrpV8FsEQFZidVdc9i7GDk4mAXKJY4e0wUJCwsES0y+dgWshEVAVWLP5X4wm 1fAVmLDw/XsECPlJBrO32cGsTmB4m2tT8FsIQEbibVLZ7FC2GoSNxYuY4HoFZQ4OfMJmM0sIC Fx8MULZog53BK3T09lnsDINwtJ2SwkZQsYmVYxahSnFpWlFukameglFWWmZ5TkJmbm6BoamOr lphYXJ6an5iQmFesl5+duYgSGVD0DA+MOxpuT/Q4xSnIwKYnyNjO3hAvxJeWnVGYkFmfEF5Xm pBYfYpTh4FCS4A1hag0XEixKTU+tSMvMAQY3TFqCg0dJhPcLI1Cat7ggMbc4Mx0idYpRUUqc1 xukTwAkkVGaB9cGi6hLjLJSwryMDAwMQjwFqUW5mSWo8q8YxTkYlYR5A0Cm8GTmlcBNfwW0mA loca1DM8jikkSElFQDY16heM419t1zf27PnPdR9OH+9OD1t9rero9na5C1vbVq5u5TKxo93vV e/GqTdPd+aK6MeetNES794A86oocuzpc5+s7ws6l/t8K/7Ft7S8+bThApD+5dNuusWnn3wdni e6tVFW2LBAs2nZ5eNa+iQty3/cFB3179bTMUpyodM/BJ0ugz0z+wXImlOCPRUIu5qDgRAKsS0 nSjAgAA X-Env-Sender: prvs=994f31c19=anthony.perard@citrix.com X-Msg-Ref: server-14.tower-206.messagelabs.com!1468334953!13312291!1 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.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 58643 invoked from network); 12 Jul 2016 14:49:14 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-14.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 12 Jul 2016 14:49:14 -0000 X-IronPort-AV: E=Sophos;i="5.28,352,1464652800"; d="scan'208";a="365727580" From: Anthony PERARD To: Date: Tue, 12 Jul 2016 15:42:51 +0100 Message-ID: <20160712144251.558-15-anthony.perard@citrix.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160712144251.558-1-anthony.perard@citrix.com> References: <20160712144251.558-1-anthony.perard@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Anthony PERARD , Wei Liu , Ian Jackson Subject: [Xen-devel] [PATCH v6 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 af3b6e9..0229d44 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