diff mbox series

[for-4.16] tools/configure: make iPXE dependent on QEMU traditional

Message ID 20211109094721.53346-1-roger.pau@citrix.com (mailing list archive)
State New, archived
Headers show
Series [for-4.16] tools/configure: make iPXE dependent on QEMU traditional | expand

Commit Message

Roger Pau Monné Nov. 9, 2021, 9:47 a.m. UTC 
iPXE is only used by QEMU traditional, so make it off by default
unless QEMU traditional is enabled.

Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
Fixes: bcf77ce510 ('configure: modify default of building rombios')
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Cc: Ian Jackson <iwj@xenproject.org>

Please run autoconf before commit.

Without this patch FreeBSD build is broken, as iPXE won't build. The
main risk would be getting the configure script runes wrong, but I
think that's fairly easy to check as it will either work on not. It's
a change in the defaults, but it basically restores the behavior
previous to disabling qemu-trad on Linux.
---
 tools/configure.ac | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Ian Jackson Nov. 9, 2021, 10:52 a.m. UTC | #1 
Roger Pau Monne writes ("[PATCH for-4.16] tools/configure: make iPXE dependent on QEMU traditional"):
> iPXE is only used by QEMU traditional, so make it off by default
> unless QEMU traditional is enabled.
> 
> Reported-by: Andrew Cooper <andrew.cooper3@citrix.com>
> Fixes: bcf77ce510 ('configure: modify default of building rombios')
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>

This seems to me to be, effectively, a missing hunk from bcf77ce510.
I have stared at it and it looks right to me.  I also looked at some
CI logs.

Release-Acked-by: Ian Jackson <iwj@xenproject.org>
Reviewed-by: Ian Jackson <iwj@xenproject.org>

Ian.
diff mbox series

Patch

diff --git a/tools/configure.ac b/tools/configure.ac
index 03eb7cf146..3ac62626a5 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -130,13 +130,13 @@  AC_SUBST(qemu_traditional)
 
 AC_ARG_ENABLE([ipxe],
     AS_HELP_STRING([--enable-ipxe],
-                   [Enable in-tree IPXE, (DEFAULT is on for x86,
-                    otherwise off, see also --with-system-ipxe)]),,[
-    case "$host_cpu" in
-        i[[3456]]86|x86_64)
-           enable_ipxe="yes";;
-        *) enable_ipxe="no";;
-    esac
+                   [Enable in-tree IPXE,
+                    (DEFAULT is off, see also --with-system-ipxe)]),,[
+    AS_IF([test "x$enable_qemu_traditional" = "xyes"], [
+        enable_ipxe="yes"
+    ], [
+        enable_ipxe="no"
+    ])
 ])
 AS_IF([test "x$enable_ipxe" = "xno"], [ipxe=n], [ipxe=y])
 AC_ARG_WITH([system-ipxe],