From patchwork Tue Nov 15 13:34:30 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: 624834 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2979051pvb; Tue, 15 Nov 2022 05:38:52 -0800 (PST) X-Google-Smtp-Source: AA0mqf5LzEzqlyhjo3NvTU1yhbnnb1tm6CFMbMcpapzOdxZyFmHz4jvK4DvdlB2ibKJ+lYw2ec6+ X-Received: by 2002:ac8:5787:0:b0:3a5:ef4:675d with SMTP id v7-20020ac85787000000b003a50ef4675dmr16868413qta.409.1668519532145; Tue, 15 Nov 2022 05:38:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668519532; cv=none; d=google.com; s=arc-20160816; b=VZqQegzxN+JYtn9feemSQFQl4x+8dOMDKQk/TpoGqYvbm8eSwHwvu74hYe9e0DTB3T LwQr5mMbaEk0chPVl0FpmsvZ32dQ/9KjrtXAuVT4MOeqZ0Btn+nXLPIxDzDewuFcDMzC oz93cbxJrqpO1CYDJzAYPQLKCEJoYRp4NMmOc0+LeJy7rYjLHTisLse5ESJ2gVA2FlnQ uy5/sqIaCPV8iQ3mulCyu0cwvEV15r74uLXk0M4yK7giflNTCgTzjIt8B4wNCMnatJtZ nmW5J7oYjXyFudiygT1MWFUdEsEq+hHHir+mCt3jXFGs5O4zv+Pnu/8Jsi3j4x1KkCmi sm6A== 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=D1q/nYWnv7CC9RJOw7+MRs0h1KGh/HdTVV3GAzdd4uM=; b=CQvTnKRrgHBIhsU/qKoZl7peLGzidrm5phvdIW8Fp4vaex9XhTMmVcsEas7WDZfnsX Qgjlekw9+hekhhfolMIgmnulFiv3eUA/NV2EsZuiumrS79ZLYMrL9HswHs8eWS5zpSWu USQjbvTyqg5FnsmWmhntbdbwq6U5j1MbW62nAO7E42Gi8rIFhle9aekd4uM95Lk2gOMO FBzM5c6NDODm/Ihj4ajRIbH39DKyGBbhqySz/EJoaJDjqLB9W5pONWY1EZfYxq6fA04E IeYJtOzz3MiM8hpfCrzs6/OBk0ZeQP84uNSq62orEQBoUG1MZoJ/9a93BYazl+DdyWJ/ 1lqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ye8AjOgV; 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 x22-20020a05620a449600b006f5f43caac6si8628239qkp.176.2022.11.15.05.38.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 15 Nov 2022 05:38: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=pass header.i=@linaro.org header.s=google header.b=ye8AjOgV; 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 1ouw6q-0006zE-GL; Tue, 15 Nov 2022 08:36:16 -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 1ouw5O-0006I3-Lg for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:49 -0500 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ouw5L-0004Ia-W8 for qemu-devel@nongnu.org; Tue, 15 Nov 2022 08:34:46 -0500 Received: by mail-wr1-x429.google.com with SMTP id h9so24317995wrt.0 for ; Tue, 15 Nov 2022 05:34:43 -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=D1q/nYWnv7CC9RJOw7+MRs0h1KGh/HdTVV3GAzdd4uM=; b=ye8AjOgVDLjvAN3QziHEMI3XCoTwtN7ulYk9iRWj7PZ+TBZK/y3rfS7GG3syvUSiR1 kyLjJ4T2mVh+yhC8rfTPP5xdtUnZeZ+say91r6PImvoVgxdRCM1FzEo9dOYCJXMpxmYj k7yDpYSeRoGJ4gvNLOhtLQM5MlfcoykLwIDGg/pzU7Kd/DNl2t3D/+3UdD+LQ5Fg9tWB 7i/rZLXNGd4aHxO77g4vPRs2jbyVQlcIxcZHUIpk/SVOEVzfwqWjk2rLIwggbBjF/Brs 6WgwsDVZPPIrJH0rNalApYLxuYENGJUPXcCWDxi4TS/X9jkIUrb+sim9xsPrdyxBMbxs bJzA== 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=D1q/nYWnv7CC9RJOw7+MRs0h1KGh/HdTVV3GAzdd4uM=; b=gl0qLoarUeQgd40uId8LhTeztiLRP9wSSVKAPK39Li9kH3hkyiPXCvodQrs/g2wj3O iSeNvWHtGQQdQvhBLfleZ09wiLmUPIaKQsQ01HJBHlAE/4waRQsJ+1dz7AN5CTfpne4L yZk9T5sK8Anow+nCh6wpc5pv56oqgHbcOHAHVmrBrdT9wJpKJK03bAG1I77fepAErK96 J8GmXL+N0cMWSJzISMxftxqUVyFD1qeZAo6Tl5+sMKSnohr5BQLA2/u7Aesuy3smHjlX c8ECWGwnptY5G1EX3VEauUp7Bxg6tzhFGNyk/cRJND33zW0r9U2d7xsLhViOuy7atC+2 gO1w== X-Gm-Message-State: ANoB5pliR4JNwEBewnmWmXtLyXlclkdTb9TRFDDqi4sytwN/0fstwYDb JbE4vRSqDV4onBxg1knVHESBug== X-Received: by 2002:a5d:42c6:0:b0:235:cebf:8a0f with SMTP id t6-20020a5d42c6000000b00235cebf8a0fmr10738827wrr.220.1668519282145; Tue, 15 Nov 2022 05:34:42 -0800 (PST) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id t67-20020a1c4646000000b003cfa622a18asm21515616wma.3.2022.11.15.05.34.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Nov 2022 05:34:40 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 521EB1FFB8; Tue, 15 Nov 2022 13:34:39 +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 01/10] Run docker probe only if docker or podman are available Date: Tue, 15 Nov 2022 13:34:30 +0000 Message-Id: <20221115133439.2348929-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221115133439.2348929-1-alex.bennee@linaro.org> References: <20221115133439.2348929-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x429.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: <20221111145529.4020801-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 ;;