mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/vm: do not pollute configure with --efi-aarch64

Browse Source 
Just make EFI_AARCH64 a variable in the makefile that defaults to the efi
firmware included with QEMU.  It can be redefined on the "make" command
line.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2020-08-06 14:00:50 +02:00
parent ac76f9d17c
commit f5c730698a
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
configure vendored
View File

@ -418,7 +418,6 @@ prefix="/usr/local"
mandir="\${prefix}/share/man" mandir="\${prefix}/share/man"
datadir="\${prefix}/share" datadir="\${prefix}/share"
firmwarepath="\${prefix}/share/qemu-firmware" firmwarepath="\${prefix}/share/qemu-firmware"
efi_aarch64=""
qemu_docdir="\${prefix}/share/doc/qemu" qemu_docdir="\${prefix}/share/doc/qemu"
bindir="\${prefix}/bin" bindir="\${prefix}/bin"
libdir="\${prefix}/lib" libdir="\${prefix}/lib"
@ -1109,8 +1108,6 @@ for opt do
;; ;;
--firmwarepath=*) firmwarepath="$optarg" --firmwarepath=*) firmwarepath="$optarg"
;; ;;
--efi-aarch64=*) efi_aarch64="$optarg"
;;
--host=*|--build=*|\ --host=*|--build=*|\
--disable-dependency-tracking|\ --disable-dependency-tracking|\
--sbindir=*|--sharedstatedir=*|\ --sbindir=*|--sharedstatedir=*|\
@ -3650,20 +3647,6 @@ EOF
fi fi
fi fi
############################################
# efi-aarch64 probe
# Check for efi files needed by aarch64 VMs.
# By default we will use the efi included with QEMU.
# Allow user to override the path for efi also.
if ! test -f "$efi_aarch64"; then
if test -f $source_path/pc-bios/edk2-aarch64-code.fd.bz2; then
# valid after build
efi_aarch64=$PWD/pc-bios/edk2-aarch64-code.fd
else
efi_aarch64=""
fi
fi
########################################## ##########################################
# libcap-ng library probe # libcap-ng library probe
if test "$cap_ng" != "no" ; then if test "$cap_ng" != "no" ; then
@ -6861,7 +6844,6 @@ if test "$docs" != "no"; then
echo "sphinx-build $sphinx_build" echo "sphinx-build $sphinx_build"
fi fi
echo "genisoimage $genisoimage" echo "genisoimage $genisoimage"
echo "efi_aarch64 $efi_aarch64"
echo "python_yaml $python_yaml" echo "python_yaml $python_yaml"
echo "slirp support $slirp $(echo_version $slirp $slirp_version)" echo "slirp support $slirp $(echo_version $slirp $slirp_version)"
if test "$slirp" != "no" ; then if test "$slirp" != "no" ; then
@ -7963,7 +7945,6 @@ echo "PYTHON=$python" >> $config_host_mak
echo "SPHINX_BUILD=$sphinx_build" >> $config_host_mak echo "SPHINX_BUILD=$sphinx_build" >> $config_host_mak
echo "SPHINX_WERROR=$sphinx_werror" >> $config_host_mak echo "SPHINX_WERROR=$sphinx_werror" >> $config_host_mak
echo "GENISOIMAGE=$genisoimage" >> $config_host_mak echo "GENISOIMAGE=$genisoimage" >> $config_host_mak
echo "EFI_AARCH64=$efi_aarch64" >> $config_host_mak
echo "PYTHON_YAML=$python_yaml" >> $config_host_mak echo "PYTHON_YAML=$python_yaml" >> $config_host_mak
echo "CC=$cc" >> $config_host_mak echo "CC=$cc" >> $config_host_mak
if $iasl -h > /dev/null 2>&1; then if $iasl -h > /dev/null 2>&1; then

2
tests/vm/Makefile.include
View File

@ -2,6 +2,8 @@
.PHONY: vm-build-all vm-clean-all .PHONY: vm-build-all vm-clean-all
EFI_AARCH64 = $(wildcard $(BUILD_DIR)/pc-bios/edk2-aarch64-code.fd)
IMAGES := freebsd netbsd openbsd centos fedora IMAGES := freebsd netbsd openbsd centos fedora
ifneq ($(GENISOIMAGE),) ifneq ($(GENISOIMAGE),)
IMAGES += ubuntu.i386 centos IMAGES += ubuntu.i386 centos