xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Wei Liu <wei.liu2@citrix.com>
To: xen-devel@lists.xen.org
Cc: Ian Jackson <ian.jackson@eu.citrix.com>,
	Wei Liu <wei.liu2@citrix.com>,
	Ian Campbell <ian.campbell@citrix.com>,
	Roger Pau Monne <roger.pau@citrix.com>
Subject: [PATCH V5 3/4] tools: enable OVMF build for Linux by default
Date: Thu, 5 Dec 2013 17:29:32 +0000	[thread overview]
Message-ID: <1386264573-30292-4-git-send-email-wei.liu2@citrix.com> (raw)
In-Reply-To: <1386264573-30292-1-git-send-email-wei.liu2@citrix.com>

Now OVMF can build on Linux, but not NetBSD. I suspect it won't build on
FreeBSD either. Even if we fix OVMF build script, it requires upstream
QEMU, which to the best of my knowledge is not available in *BSD Xen
build at the moment. So the simple thing to do is to only enable OVMF
build for Linux.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Cc: Ian Campbell <ian.campbell@citrix.com>
Cc: Ian Jackson <ian.jackson@eu.citrix.com>
Cc: Roger Pau Monne <roger.pau@citrix.com>
---
 tools/configure    |   24 +++++++++++++-----------
 tools/configure.ac |   17 ++++++++++++++++-
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/tools/configure b/tools/configure
index ff82b32..0bcc922 100755
--- a/tools/configure
+++ b/tools/configure
@@ -1422,7 +1422,8 @@ Optional Features:
   --enable-xenapi         Enable Xen API Bindings (default is DISABLED)
   --disable-ocamltools    Disable Ocaml tools (default is ENABLED)
   --disable-xsmpolicy     Disable XSM policy compilation (default is ENABLED)
-  --enable-ovmf           Enable OVMF (default is DISABLED)
+  --enable-ovmf           Enable OVMF build, (DEFAULT is on for Linux,
+                          otherwise off)
   --disable-rombios       Disable ROM BIOS (default is ENABLED)
   --disable-seabios       Disable SeaBIOS (default is ENABLED)
   --disable-debug         Disable debug build of tools (default is ENABLED)
@@ -3571,23 +3572,24 @@ xsmpolicy=$ax_cv_xsmpolicy
 # Check whether --enable-ovmf was given.
 if test "${enable_ovmf+set}" = set; then :
   enableval=$enable_ovmf;
-fi
-
-
-if test "x$enable_ovmf" = "xno"; then :
+else
 
-    ax_cv_ovmf="n"
+    case $host_os in
+        linux*)
+           enable_ovmf="yes";;
+        *) enable_ovmf="no";;
+    esac
 
-elif test "x$enable_ovmf" = "xyes"; then :
+fi
 
-    ax_cv_ovmf="y"
+if test "x$enable_ovmf" = "xyes"; then :
 
-elif test -z $ax_cv_ovmf; then :
+    ovmf=y
+else
 
-    ax_cv_ovmf="n"
+    ovmf=n
 
 fi
-ovmf=$ax_cv_ovmf
 
 
 
diff --git a/tools/configure.ac b/tools/configure.ac
index b2941a4..c317932 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -53,7 +53,22 @@ AX_ARG_DEFAULT_ENABLE([monitors], [Disable xenstat and xentop monitoring tools])
 AX_ARG_DEFAULT_DISABLE([xenapi], [Enable Xen API Bindings])
 AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools])
 AX_ARG_DEFAULT_ENABLE([xsmpolicy], [Disable XSM policy compilation])
-AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF])
+
+AC_ARG_ENABLE([ovmf],
+    AS_HELP_STRING([--enable-ovmf],
+                   [Enable OVMF build, (DEFAULT is on for Linux, otherwise off)]),,[
+    case $host_os in
+        linux*)
+           enable_ovmf="yes";;
+        *) enable_ovmf="no";;
+    esac
+])
+AS_IF([test "x$enable_ovmf" = "xyes"], [
+    ovmf=y],[
+    ovmf=n
+])
+AC_SUBST(ovmf)
+
 AX_ARG_DEFAULT_ENABLE([rombios], [Disable ROM BIOS])
 AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS])
 AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools])
-- 
1.7.10.4

  parent reply	other threads:[~2013-12-05 17:29 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-05 17:29 [PATCH V5 0/4] Make OVMF work with Xen Wei Liu
2013-12-05 17:29 ` [PATCH V5 1/4] hvmloader/ovmf: setup ovmf_info Wei Liu
2013-12-05 17:29 ` [PATCH V5 2/4] hvmloader/ovmf: setup E820 map Wei Liu
2013-12-05 17:29 ` Wei Liu [this message]
2013-12-05 17:29 ` [PATCH V5 4/4] tools/ovmf-makefile: only build debug target when specified Wei Liu
2013-12-05 17:42 ` [PATCH V5 0/4] Make OVMF work with Xen Ian Campbell
2013-12-06  9:01 ` Fabio Fantoni
2013-12-06 10:47   ` Wei Liu
2013-12-06 13:08 ` Ian Campbell

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=1386264573-30292-4-git-send-email-wei.liu2@citrix.com \
    --to=wei.liu2@citrix.com \
    --cc=ian.campbell@citrix.com \
    --cc=ian.jackson@eu.citrix.com \
    --cc=roger.pau@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).