OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

configure: detect and report genisoimage

Browse Source 
This is used for some of the vm-build tests so lets detect it and
behave sanely when it is not installed.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20200303150622.20133-8-alex.bennee@linaro.org>
This commit is contained in:
Alex Bennée 2020-03-03 15:06:20 +00:00
parent af17e7e7d3
commit 39d87c8c0c
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -936,6 +936,17 @@ do
fi fi
done done
# Check for ancillary tools used in testing
genisoimage=
for binary in genisoimage
do
if has $binary
then
genisoimage=$(command -v "$binary")
break
fi
done
: ${smbd=${SMBD-/usr/sbin/smbd}} : ${smbd=${SMBD-/usr/sbin/smbd}}
# Default objcc to clang if available, otherwise use CC # Default objcc to clang if available, otherwise use CC
@ -6567,6 +6578,7 @@ echo "python $python ($python_version)"
if test "$docs" != "no"; then if test "$docs" != "no"; then
echo "sphinx-build $sphinx_build" echo "sphinx-build $sphinx_build"
fi fi
echo "genisoimage $genisoimage"
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
echo "smbd $smbd" echo "smbd $smbd"
@ -7616,6 +7628,7 @@ echo "INSTALL_PROG=$install -c -m 0755" >> $config_host_mak
echo "INSTALL_LIB=$install -c -m 0644" >> $config_host_mak echo "INSTALL_LIB=$install -c -m 0644" >> $config_host_mak
echo "PYTHON=$python" >> $config_host_mak echo "PYTHON=$python" >> $config_host_mak
echo "SPHINX_BUILD=$sphinx_build" >> $config_host_mak echo "SPHINX_BUILD=$sphinx_build" >> $config_host_mak
echo "GENISOIMAGE=$genisoimage" >> $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
echo "IASL=$iasl" >> $config_host_mak echo "IASL=$iasl" >> $config_host_mak

14
tests/vm/Makefile.include
View File

@ -2,7 +2,11 @@
.PHONY: vm-build-all vm-clean-all .PHONY: vm-build-all vm-clean-all
IMAGES := ubuntu.i386 freebsd netbsd openbsd centos fedora IMAGES := freebsd netbsd openbsd centos fedora
ifneq ($(GENISOIMAGE),)
IMAGES += ubuntu.i386 centos
endif
IMAGES_DIR := $(HOME)/.cache/qemu-vm/images IMAGES_DIR := $(HOME)/.cache/qemu-vm/images
IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES)) IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES))
@ -12,12 +16,16 @@ IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES))
vm-help vm-test: vm-help vm-test:
@echo "vm-help: Test QEMU in preconfigured virtual machines" @echo "vm-help: Test QEMU in preconfigured virtual machines"
@echo @echo
@echo " vm-build-ubuntu.i386 - Build QEMU in ubuntu i386 VM"
@echo " vm-build-freebsd - Build QEMU in FreeBSD VM" @echo " vm-build-freebsd - Build QEMU in FreeBSD VM"
@echo " vm-build-netbsd - Build QEMU in NetBSD VM" @echo " vm-build-netbsd - Build QEMU in NetBSD VM"
@echo " vm-build-openbsd - Build QEMU in OpenBSD VM" @echo " vm-build-openbsd - Build QEMU in OpenBSD VM"
@echo " vm-build-centos - Build QEMU in CentOS VM, with Docker"
@echo " vm-build-fedora - Build QEMU in Fedora VM" @echo " vm-build-fedora - Build QEMU in Fedora VM"
ifneq ($(GENISOIMAGE),)
@echo " vm-build-centos - Build QEMU in CentOS VM, with Docker"
@echo " vm-build-ubuntu.i386 - Build QEMU in ubuntu i386 VM"
else
@echo " (install genisoimage to build centos/ubuntu images)"
endif
@echo "" @echo ""
@echo " vm-build-all - Build QEMU in all VMs" @echo " vm-build-all - Build QEMU in all VMs"
@echo " vm-clean-all - Clean up VM images" @echo " vm-clean-all - Clean up VM images"