From patchwork Mon Mar 2 18:19:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 184107 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp2703486ile; Mon, 2 Mar 2020 10:21:52 -0800 (PST) X-Google-Smtp-Source: ADFU+vsuvesMSQXfkb+tveacX+WbXsmfZRBgFsfW/S/IuasQuJV91b6oswp1PlibeTxSBwgZmuWx X-Received: by 2002:a0c:ca94:: with SMTP id a20mr642738qvk.150.1583173312733; Mon, 02 Mar 2020 10:21:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583173312; cv=none; d=google.com; s=arc-20160816; b=NifJeye6Ly95ONE9vxCk/Yw6/w++OU1+SYI3BcydbaV9W/+wGlr6MkJFPCfTvb26jp yecG7SjhMdpx/8M3QtX5sWyeDBES+UdDfVO3izxoQhho0LWWyt96PFvNvw22tceA7clC 4evJpG3PURa1Spxl/Bk4nYWSpolf2W6Q8su0paXeAz7Q9mwG5hdmcCvNpjXh/mjPtur8 NAFfPPbUjByQVLysAJvMqksh17ftftL7ckbm+b5bfknPqVgbgDREJZR9RW4iNFlufocz 6tDUhA9mVLImYVOKT2Y7WpNpLDocW8OVwN+sT1W9uifOLBlxohB2st+FGLKdmsE5YlgZ Y4mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=65Txf0NtQrDZ1B5f2IUJMSN/X+Wm8MrtnU1Cud0aVmk=; b=kTFdP7wQ4kOe0tYRUwxJRxE7I2iYFJ27cG0NvtdrisRS1MubrzWNddiJQU1G6aaCRp cK3g0DxATgQbLOivY0ZeXSGWO2mT+2J1QhCa2+EbHRr/6Rs07JneHp9sHsn8YxN2GQQ4 +PlHPljTXV6aeSFVDf9CiLVzHn9r4FtVLJO2Hk8aYPXh9rUa0IgbkNHvETEm0fwt6wpr PMhgseW/50b6uPe+8KRxdhAsGZ8ROOC6HiScgPs2/tLJnV7fRRMmKYGhRHeCaahk4nEH DGKhAjZyks7xcL3ZCe3VTgm+V3FJ838IzBwuzp/7t5IU9fkNWaRIq9fdACzQgZsLUXmY Le+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=baZCwyYN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id p46si5996770qte.143.2020.03.02.10.21.52 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 02 Mar 2020 10:21:52 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=baZCwyYN; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:36950 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8phQ-0007Ur-8e for patch@linaro.org; Mon, 02 Mar 2020 13:21:52 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43602) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j8pfD-0002XH-Jf for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j8pfC-0001DT-72 for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:35 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:33213) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j8pfC-0001AO-0e for qemu-devel@nongnu.org; Mon, 02 Mar 2020 13:19:34 -0500 Received: by mail-wr1-x430.google.com with SMTP id x7so1033989wrr.0 for ; Mon, 02 Mar 2020 10:19:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=65Txf0NtQrDZ1B5f2IUJMSN/X+Wm8MrtnU1Cud0aVmk=; b=baZCwyYNXJIeoYtkK32eojnZSHp4XgJQOynBD3iQtaDYbCHODKRErsNnmqKvf6RhLP QzuLIIFVXaSyUuymiBhPY6Hot6SeS62ofHsPls+4wsKbw5KDDd1+tWCsmIZcjD9ebtRp 9ME5k23ZGh3lIgIqxTXJGXK6BejELYz5aTNttg3Ro37JFQlXMzeZUnCJ33QjqSp0BkQV q+qDWLSv/ZgyVAKY4I2EOiJXzA+ZottULg21XOdN7NxVQPF52Y240ppRSnRFXeMwY4Ok 4Ee+niwWZjMJci8mXoLF1QA7v4TIhNY5qUPxB7VE2Gcr+zqFxJ99q5MNYkS68wFcHVIP t6dA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=65Txf0NtQrDZ1B5f2IUJMSN/X+Wm8MrtnU1Cud0aVmk=; b=pqBFuXVJAlYk1kNK7FDCLeMf/11C4tp7xMxgYl53BbZeIkrvBsGVFiZhjGEunRc1GB tXPdzhwvbKIUJoVMtpfofAH46nI8Q8dSV9b5QQ42Jv9OUui5MoLhnxJDBnJ7gloCjU9+ 1Gf1aNOiwajyRJH98HMyRwoXkomVUP6H9mYFdueFMjPH5OjHeK3VaV6AD7cBxeFTcCXL dToq8XSqFNm4CD+W2jMckQgT5uQfGLcyep9As22lQHvuvuQ4ai3TydYGWfl2bVv6Ew7s Cf/Artfc/0O6Li9Yo6niibXvjBqM2tVAUjG8oARkh9+ck+BFA+ipQszQvq2hbXn+/Eyb m0EA== X-Gm-Message-State: ANhLgQ0DoQonipzE3pTNx9oYHWMbuTkZ35Cc85FTjgOFgXQ8G/fJk9XN ZDr85bwQVCWEGJf42LZH9ZVL+w== X-Received: by 2002:adf:cc85:: with SMTP id p5mr801024wrj.196.1583173156868; Mon, 02 Mar 2020 10:19:16 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z16sm28676472wrp.33.2020.03.02.10.19.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Mar 2020 10:19:13 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3C9081FF98; Mon, 2 Mar 2020 18:19:08 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 08/10] configure: detect and report genisoimage Date: Mon, 2 Mar 2020 18:19:05 +0000 Message-Id: <20200302181907.32110-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200302181907.32110-1-alex.bennee@linaro.org> References: <20200302181907.32110-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::430 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- configure | 13 +++++++++++++ tests/vm/Makefile.include | 14 +++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/configure b/configure index caa65f58831..376ccb25623 100755 --- a/configure +++ b/configure @@ -936,6 +936,17 @@ do fi 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}} # Default objcc to clang if available, otherwise use CC @@ -6567,6 +6578,7 @@ echo "python $python ($python_version)" if test "$docs" != "no"; then echo "sphinx-build $sphinx_build" fi +echo "genisoimage $genisoimage" echo "slirp support $slirp $(echo_version $slirp $slirp_version)" if test "$slirp" != "no" ; then 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 "PYTHON=$python" >> $config_host_mak echo "SPHINX_BUILD=$sphinx_build" >> $config_host_mak +echo "GENISOIMAGE=$genisoimage" >> $config_host_mak echo "CC=$cc" >> $config_host_mak if $iasl -h > /dev/null 2>&1; then echo "IASL=$iasl" >> $config_host_mak diff --git a/tests/vm/Makefile.include b/tests/vm/Makefile.include index 778e5067554..1bf9693d195 100644 --- a/tests/vm/Makefile.include +++ b/tests/vm/Makefile.include @@ -2,7 +2,11 @@ .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 IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES)) @@ -12,12 +16,16 @@ IMAGE_FILES := $(patsubst %, $(IMAGES_DIR)/%.img, $(IMAGES)) vm-help vm-test: @echo "vm-help: Test QEMU in preconfigured virtual machines" @echo - @echo " vm-build-ubuntu.i386 - Build QEMU in ubuntu i386 VM" @echo " vm-build-freebsd - Build QEMU in FreeBSD VM" @echo " vm-build-netbsd - Build QEMU in NetBSD 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" +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 " vm-build-all - Build QEMU in all VMs" @echo " vm-clean-all - Clean up VM images"