From patchwork Tue Nov 22 09:56:00 2022 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: 627500 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2344543pvb; Tue, 22 Nov 2022 01:57:18 -0800 (PST) X-Google-Smtp-Source: AA0mqf5rrw2Y7/fXiBRH9jdf9WI7cWNbdbsvK+qeRGlS2nab6yOezriQek4Hc8gdzWGf5P49P7n+ X-Received: by 2002:a05:620a:468f:b0:6f4:fe28:a69f with SMTP id bq15-20020a05620a468f00b006f4fe28a69fmr19742737qkb.21.1669111038528; Tue, 22 Nov 2022 01:57:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669111038; cv=none; d=google.com; s=arc-20160816; b=tFvLwGiiwM6KIjDzmp/5R8gq60pD9/CG9p1WS0vR4ACz2XMaiwiekW49MZByA6jed6 hEs4wYx9iUn7YF8Dp/DMWlmTUyexB29b9Hl+y2+oEpSsZBf6atSXKbAD6RZtKbygERaE KST0bGOJ6FxySU8d/eB3w8uPhKq7A4wov1JqRuVjpajGXaNikdg1OO6qwwX3f7+GwlZE spIBXRoClpquv9i7YQQym/yhJrQgvw/SPnyv+cUsaN25ATuUGBO0Y4IFoI3EAR8o0Z5B LgKvBNWU83wSrBvGQGOWb1u+66YPvElAENPG1Yxu7BGT3iDW0t9CwBplXubQ6tO0kYCH mepg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to: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:cc:to :from:dkim-signature; bh=ryh4B4BYlEzwTvoXIsMigdAmBPwQBxFG9jZxylxtaWE=; b=iCcGjRp/4GsKZvWmPcNig/asdFktj14vOkU8uLqKCl89R/fRJjMTOttoDYa/+LqfW2 i6/JtAtCnC/QQAo1eoWk+0Juk8zU5IeTsSJAu/1eDEMsNqTROHYx3oCZpr5K5wXH8O38 Ahj2GsuGzxjIKBlHxHl+i2bg3dzwu0hLeDbuF0yZKBNr8XZv4QjeUD/w29pgiqS693fZ 7eShrfZHLFH4eK/NZykOTK+OgdHBC68VRSGNG6FFMee3Dbd2vwtfhAvjlOVARBXA3Pg6 zASX9E75lX8YHVO4yNXTrr6Bt1kIXP2W/VOpikIekuwXjIRKwS2rCaFVKfMY0SyI1xq/ O5+A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hDBg7iMz; 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=pass (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 pt3-20020a056214048300b004c6a638cefdsi4619764qvb.216.2022.11.22.01.57.18 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 22 Nov 2022 01:57:18 -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=pass header.i=@linaro.org header.s=google header.b=hDBg7iMz; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxQ0r-0002Qo-7L; Tue, 22 Nov 2022 04:56:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxQ0l-0002I0-So for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:17 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oxQ0k-0003YL-2e for qemu-devel@nongnu.org; Tue, 22 Nov 2022 04:56:15 -0500 Received: by mail-wm1-x334.google.com with SMTP id l39-20020a05600c1d2700b003cf93c8156dso10869029wms.4 for ; Tue, 22 Nov 2022 01:56:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ryh4B4BYlEzwTvoXIsMigdAmBPwQBxFG9jZxylxtaWE=; b=hDBg7iMzHf5Bk+QKov4YTd4WalAnO2Fx3HrFwlryIOgVxsEsHh0AHWLf+daXEU7h5K 5tgO1zvDciP3IuNgB1G8snYHxfmE1DhhGUsYwf+4GWErFvnj+h7A4ClUcN8raMKeG6i7 C6u8lBA98MH/lExiIjqVsbwayAQnA4z7FF2ctVNg/tY5Ox0BJo9mWZ1rjf0A4TsYC7B3 GcWXwE0pAV96FXNQ0ZdYH/BrOxjRzgoWUqSKdYZPkQUOUs1/AJ+3L4agayQbvoLJPc3s dK6XX44+FwT2tm3te0cj4oHiAPsrRx1BNbfgujgs38LHzKKY31CAEc5aI2jhCL7Xytf8 RtlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ryh4B4BYlEzwTvoXIsMigdAmBPwQBxFG9jZxylxtaWE=; b=SbOx8mJNle6vr8dS9eYa42mBHmcoaS+iW3OoDC9G2kh20OcKneWKEqRup484rs3sko rqg4sjKkDau6rcwVE46LEIo9Lc2TKHKtUPejh/eMo7WXBq1HrHJmn8DW5BNru0iG9JJL 7ANChaoxYz189Si6B8T92tNdfHb6EHeBJPetrQ0euR4DWUJZtFj5rTr/q/EJy85UY/FG hRs+5IrwYDvmbzAxqvXB0Ps8DQbb0JZtb9iG+fg/+BSbsjNXmXU+emllt6zFM7gqBWVZ QvBIgmr1cxVEYRK5WhAeQOfW/PLn8n1d1yw79efUfJdcvjFgAO+Uvy9b1gKyiQP+inM5 nLHg== X-Gm-Message-State: ANoB5pkbefVNBJkOgdxj612fa7qgS87BUweDKOqg8Bz7RUt66fcbEorj zfxDPQO/1AsnO8CMprdm/lNteA== X-Received: by 2002:a05:600c:4f45:b0:3cf:9be3:8d26 with SMTP id m5-20020a05600c4f4500b003cf9be38d26mr7712391wmq.185.1669110971663; Tue, 22 Nov 2022 01:56:11 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id j15-20020adfe50f000000b002366d1cc198sm13464326wrm.41.2022.11.22.01.56.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Nov 2022 01:56:11 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id A1DCE1FFB8; Tue, 22 Nov 2022 09:56:10 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Stefan Weil , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , Thomas Huth , Paolo Bonzini Subject: [PULL v2 01/11] Run docker probe only if docker or podman are available Date: Tue, 22 Nov 2022 09:56:00 +0000 Message-Id: <20221122095610.3343175-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221122095610.3343175-1-alex.bennee@linaro.org> References: <20221122095610.3343175-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Stefan Weil The docker probe uses "sudo -n" which can cause an e-mail with a security warning each time when configure is run. Therefore run docker probe only if either docker or podman are available. That avoids the problematic "sudo -n" on build environments which have neither docker nor podman installed. Fixes: c4575b59155e2e00 ("configure: store container engine in config-host.mak") Signed-off-by: Stefan Weil Message-Id: <20221030083510.310584-1-sw@weilnetz.de> Signed-off-by: Alex Bennée Reviewed-by: Thomas Huth Message-Id: <20221117172532.538149-2-alex.bennee@linaro.org> diff --git a/configure b/configure index 66928692b0..26c7bc5154 100755 --- a/configure +++ b/configure @@ -1780,7 +1780,7 @@ fi # functions to probe cross compilers container="no" -if test $use_containers = "yes"; then +if test $use_containers = "yes" && (has "docker" || has "podman"); then case $($python "$source_path"/tests/docker/docker.py probe) in *docker) container=docker ;; podman) container=podman ;;