From patchwork Wed Mar 4 10:01:52 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: 184167 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp4708671ile; Wed, 4 Mar 2020 02:06:14 -0800 (PST) X-Google-Smtp-Source: ADFU+vsWLGgfSqaYNyK+gUQCwLmmxgD2Y40dsuQpVKicsr8UnxDgQcV4zbcdiwWjTlfbBCloHrcr X-Received: by 2002:a05:6214:50e:: with SMTP id v14mr1446062qvw.219.1583316374245; Wed, 04 Mar 2020 02:06:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1583316374; cv=none; d=google.com; s=arc-20160816; b=ZKF1/o4BDJ7avkmllUX3sV8DvvZd4g+c2uPvbjgR3qsuQZa9DfUvFNjC5P/3iPMERh PaATBv4jXdUvgLD93nDfAjcYVRT1KiFBPbYIQjHaxL8QRnk+lakjcKC4rjbBGPSnXGp1 ngXDF4k+7Tak0jnEEQLBKc1FWI8RemHi/zOUgogqw57paQQfAMMP5C1pde4iA8LOBXjY lx8U75kL2b/BYp+J9DW6jqtTdhx6YIl6c3RbsN1RzRr21EMfAec34lJFnL7+HMrPEMPA +f8Qsjz51crNdQD6hBJPBGa+50vthPDjbWWJhwW3IQ71etr23xRDblWBBA93vGpRGE4j dx6g== 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=8IoRhGZ2eqfxiUMqD1IQ15ijzzrrTQ6InFUO0k6F5mQ=; b=duMhYdeHCDB+UBTC938PzZIcVBGof3piu+xZ9fUfhevJ2X8542qpLEx8Q49v+WxWoQ 02mTEICoC4WG+AzNXGT/J3eS0cT6oXemUYvGFJ8nLOA2IkulEZ3uDFwMAh3D1uYlhLMi ubjKYYacG/2X/ZQ3PHPt6/5+I3pU1efKxdxBqYEaeUo5xvA7+WpUcyiJhRtzgYQRqHKF +iAlfhE8/IIgmO5lK7Z6GjXDwtPRQZHl7IY3dd5T1WRBD9nsbacbhWYDx+jp89OaeoiW OL1D6EZnIh3UoLl/SNQw5HviPoIQKdZsNziz5iMA8/nRa57t3dmTnazg91kGQIYug/DU qTDw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=EneEo4fG; 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 g2si688561qtb.224.2020.03.04.02.06.14 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Mar 2020 02:06:14 -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=EneEo4fG; 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]:60052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qur-0005CD-OQ for patch@linaro.org; Wed, 04 Mar 2020 05:06:13 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41770) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j9Qqv-000722-FI for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j9Qqt-0000nh-K7 for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:09 -0500 Received: from mail-wr1-x42d.google.com ([2a00:1450:4864:20::42d]:41739) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j9Qqt-0000ky-D1 for qemu-devel@nongnu.org; Wed, 04 Mar 2020 05:02:07 -0500 Received: by mail-wr1-x42d.google.com with SMTP id v4so1590811wrs.8 for ; Wed, 04 Mar 2020 02:02:07 -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=8IoRhGZ2eqfxiUMqD1IQ15ijzzrrTQ6InFUO0k6F5mQ=; b=EneEo4fGMDkOTBs22ZPqJkV3yB3aP3Dar/OaTM1KeR4fv+dhkcOnLzAC4MhDP8D0YO z2uZm/t3tQplRy9LrQvUbS2XXbGZPG0E69XLbnYfeuyBswjKiZEjoioHJIyQq/xygfv1 G2VXdKKKQP1o5Hi7ia9dRhN0ItdyAXSPTP7M+JbKyJHPCRKVVh6AzNwBX6Dn8Xo3sTlO JwaHnnIn1/Y5mTg0kr8uYLUPlzroJnaHqZu9u1CfyRLCma8TjFVDjX7siiMg4SLDZw1b Bp79kyPESbaQx+HMNl5PvAhaGs+KdFGVE0WU6ruv4LmQM0sJdrkuaX0izy1N2p/vmbW3 E3yA== 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=8IoRhGZ2eqfxiUMqD1IQ15ijzzrrTQ6InFUO0k6F5mQ=; b=PARHUXyva95PvEy9uwCMT2PA/Hq6dUAmqJUwaL9PsI4OyE3fGF1V9lNRg2w67qNXPt NUliGwjVnpZRyy07bTYSFnDW/3atcs2iCJ1CcQM2qAriG57SWma7civK1b2B+mOcVHWh qkIgzhK4mHqZR5zMMrfopvKtEkC4UnI94qT+8pQjZRqlAP6PNBRS+qLllDeqbpO3CvpC kg2DsWz5vrpGkBpHgOMtkEJS8hgCZuQ+DDADComZJbAw7QLOQuRx58TLSoFu17lm9UHW EcpbpZaHN3bJ2lMamuc4Pih0auklP7uC1MWLyl7AZcKSppdF/BRKVTtG+wbtNjI1w2bH iQ9g== X-Gm-Message-State: ANhLgQ3w0TQDm8DRPCKDha5dpBlWmty57qsltIxqR2jeKrJ6DhVuBgBZ 8iL3+fVVIYXZS5DEM/5/vwkhzQ== X-Received: by 2002:a5d:4d48:: with SMTP id a8mr3255313wru.35.1583316126338; Wed, 04 Mar 2020 02:02:06 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id m3sm18662148wrx.9.2020.03.04.02.01.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Mar 2020 02:02:00 -0800 (PST) Received: from zen.home.arpa (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 829231FF96; Wed, 4 Mar 2020 10:01:55 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Subject: [PULL 7/9] configure: detect and report genisoimage Date: Wed, 4 Mar 2020 10:01:52 +0000 Message-Id: <20200304100154.14822-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200304100154.14822-1-alex.bennee@linaro.org> References: <20200304100154.14822-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::42d 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 , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= 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 Reviewed-by: Richard Henderson Message-Id: <20200303150622.20133-8-alex.bennee@linaro.org> -- 2.20.1 diff --git a/configure b/configure index 7b373bc0bb8..fab6281eb70 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"