From: Anthony PERARD <anthony.perard@citrix.com>
To: xen-devel@lists.xen.org
Cc: Anthony PERARD <anthony.perard@citrix.com>,
Wei Liu <wei.liu2@citrix.com>,
Ian Jackson <ian.jackson@eu.citrix.com>
Subject: [PATCH v5 14/14] configure: do not depend on SEABIOS_PATH or OVMF_PATH ...
Date: Wed, 22 Jun 2016 18:15:45 +0100 [thread overview]
Message-ID: <20160622171545.5304-15-anthony.perard@citrix.com> (raw)
In-Reply-To: <20160622171545.5304-1-anthony.perard@citrix.com>
... 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 <anthony.perard@citrix.com>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
---
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
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
prev parent reply other threads:[~2016-06-22 17:15 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-06-22 17:15 [PATCH v5 00/14] Load BIOS via toolstack instead of been embedded in hvmloader Anthony PERARD
2016-06-22 17:15 ` [PATCH v5 01/14] libxc: Rework extra module initialisation Anthony PERARD
2016-07-07 14:55 ` Wei Liu
2016-07-08 10:52 ` Anthony PERARD
2016-07-08 11:29 ` Wei Liu
2016-07-08 13:26 ` Anthony PERARD
2016-06-22 17:15 ` [PATCH v5 02/14] libxc: Prepare a start info structure for hvmloader Anthony PERARD
2016-06-23 14:44 ` Boris Ostrovsky
2016-06-23 16:52 ` Anthony PERARD
2016-07-07 14:55 ` Wei Liu
2016-07-08 10:55 ` Anthony PERARD
2016-06-22 17:15 ` [PATCH v5 03/14] configure: #define SEABIOS_PATH and OVMF_PATH Anthony PERARD
2016-06-22 17:15 ` [PATCH v5 04/14] firmware/makefile: install BIOS blob Anthony PERARD
2016-07-07 14:55 ` Wei Liu
2016-06-22 17:15 ` [PATCH v5 05/14] libxl: Load guest BIOS from file Anthony PERARD
2016-06-24 7:23 ` Jan Beulich
2016-06-24 14:20 ` Anthony PERARD
2016-07-07 14:55 ` Wei Liu
2016-06-22 17:15 ` [PATCH v5 06/14] xen: Move the hvm_start_info C representation from libxc to public/xen.h Anthony PERARD
2016-07-07 14:55 ` Wei Liu
2016-07-07 15:07 ` Jan Beulich
2016-07-07 15:28 ` Wei Liu
2016-07-08 9:53 ` Julien Grall
2016-07-07 15:02 ` Andrew Cooper
2016-07-07 15:09 ` Jan Beulich
2016-07-07 15:12 ` Andrew Cooper
2016-06-22 17:15 ` [PATCH v5 07/14] hvmloader: Grab the hvm_start_info pointer Anthony PERARD
2016-06-22 17:15 ` [PATCH v5 08/14] hvmloader: Locate the BIOS blob Anthony PERARD
2016-06-24 7:33 ` Jan Beulich
2016-06-24 17:02 ` Anthony PERARD
2016-06-27 7:13 ` Jan Beulich
2016-06-30 15:04 ` Anthony PERARD
2016-07-01 6:40 ` Jan Beulich
2016-06-22 17:15 ` [PATCH v5 09/14] hvmloader: Check modules whereabouts in perform_tests Anthony PERARD
2016-06-24 7:44 ` Jan Beulich
2016-06-24 17:14 ` Anthony PERARD
2016-06-27 7:20 ` Jan Beulich
2016-06-22 17:15 ` [PATCH v5 10/14] hvmloader: Load SeaBIOS from hvm_start_info modules Anthony PERARD
2016-06-24 7:46 ` Jan Beulich
2016-06-22 17:15 ` [PATCH v5 11/14] hvmloader: Load OVMF from modules Anthony PERARD
2016-06-22 17:15 ` [PATCH v5 12/14] hvmloader: bios->bios_load() now needs to be defined Anthony PERARD
2016-06-22 17:15 ` [PATCH v5 13/14] hvmloader: Always build-in SeaBIOS and OVMF loader Anthony PERARD
2016-06-22 17:15 ` Anthony PERARD [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160622171545.5304-15-anthony.perard@citrix.com \
--to=anthony.perard@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.