[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] tools/configure: make iPXE dependent on QEMU traditional
commit 9d9cd0c6f5b16652f61e7f21233ec8dfd6cf7df2 Author: Roger Pau Monne <roger.pau@xxxxxxxxxx> AuthorDate: Tue Nov 9 10:47:21 2021 +0100 Commit: Ian Jackson <iwj@xxxxxxxxxxxxxx> CommitDate: Tue Nov 9 10:53:52 2021 +0000 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@xxxxxxxxxx> Fixes: bcf77ce510 ('configure: modify default of building rombios') Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx> Release-Acked-by: Ian Jackson <iwj@xxxxxxxxxxxxxx> Reviewed-by: Ian Jackson <iwj@xxxxxxxxxxxxxx> --- tools/configure | 28 ++++++++++++++++------------ tools/configure.ac | 14 +++++++------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/tools/configure b/tools/configure index a3d33eb907..40f970b14b 100755 --- a/tools/configure +++ b/tools/configure @@ -1504,8 +1504,8 @@ Optional Features: --enable-qemu-traditional Enable qemu traditional device model, (DEFAULT is off) - --enable-ipxe Enable in-tree IPXE, (DEFAULT is on for x86, - otherwise off, see also --with-system-ipxe) + --enable-ipxe Enable in-tree IPXE, (DEFAULT is off, see also + --with-system-ipxe) --enable-rombios Enable ROMBIOS, (DEFAULT is on if qemu-traditional or ipxe is enabled, otherwise off) --enable-systemd Enable systemd support (default is DISABLED) @@ -4300,25 +4300,29 @@ else fi -if test "x$enable_ipxe" = "xno"; then : - ipxe=n -else - ipxe=y -fi # Check whether --enable-ipxe was given. if test "${enable_ipxe+set}" = set; then : enableval=$enable_ipxe; else - case "$host_cpu" in - i[3456]86|x86_64) - enable_ipxe="yes";; - *) enable_ipxe="no";; - esac + if test "x$enable_qemu_traditional" = "xyes"; then : + + enable_ipxe="yes" + +else + + enable_ipxe="no" fi +fi + +if test "x$enable_ipxe" = "xno"; then : + ipxe=n +else + ipxe=y +fi # Check whether --with-system-ipxe was given. if test "${with_system_ipxe+set}" = set; then : 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], -- generated by git-patchbot for /home/xen/git/xen.git#master
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |