From patchwork Wed Mar 1 15:15:57 2023 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: 657824 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp3549095wrb; Wed, 1 Mar 2023 07:26:51 -0800 (PST) X-Google-Smtp-Source: AK7set8ZCqrd6tDwqiSaW1BnZl/8L6sT2UzRKy+50hOdG9htmoZN6mNA17i0N1CQkudoyOv4z9ct X-Received: by 2002:ac8:7d04:0:b0:3ba:101e:88c6 with SMTP id g4-20020ac87d04000000b003ba101e88c6mr11208239qtb.48.1677684411176; Wed, 01 Mar 2023 07:26:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677684411; cv=none; d=google.com; s=arc-20160816; b=LAIC6qmpnxk7uNi6Zb1iRk3FcW60WA3PdMQb24fF9FbRufOB+G/bYDY0rT9a1V1QR8 4FAgA7lGhCzmT600UTLvH0PAdAbYxmw5LeYAMEjhUJ/+g2aRW4c3WXxiSTVtjsCt4hnx fDQCwpUFUBoKF1aoYhkHajT/kTQoDFaI+APY7YAdbpg56lGk43mwSo7pTfUo3rTmtleR NH8YACrlZYhPfOGkWoQDJ38sCCz+xcQpEpzHy+jr6xM7N81sCRnLERUflA5138g7yAAv DDd/FP9M6SSj+Uo6cCb8PtMfhQHJTqDIlGmcdNMs4CA7A/7Dm9Y/qQpqIt+iybF2JxC7 eibA== 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=mkocC7TUPUcXj7ll+UawvcjBLr7Elh98/8Jity3e0Lo=; b=Tx2/jUKyP3Kc2tqJ5e7OZyY0W07jvmeVU6BUIk8+FsInhO3IUw2tK7ugIU0R6sYT9w pBNXjceB3mFIPw5a2Gs0PrCw/aZP1T2EjJqbMu2NGDggtyYVQAdZA9c3qxr8+ecju5vH LJVCmp/tFb71XkcfvSLfoHl5ETHAqreKpHpgrlAtX0FZW2tsvIV95Qmu4v8ULvaACOjk K+cHR5Y6cp+6fDFlRhWOSlVT0pQ6bAAFPfhpuRgW/yjSCs3duA0KkTbvxDojJmx7Ib5M kfFaUAKMzFSykPTVqJaVaH+oTFyQZ3OO7vfNOTnVbteZPOKOjVpDnV3qZCp/ADbN0+6V baVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xACdqqHx; 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 bn40-20020a05620a2ae800b0073b9e5fb99esi10633699qkb.105.2023.03.01.07.26.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 01 Mar 2023 07:26:51 -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=xACdqqHx; 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 1pXOJr-0000nc-0B; Wed, 01 Mar 2023 10:24:39 -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 1pXOJi-0000bC-DQ for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:24:31 -0500 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pXOJd-000127-DG for qemu-devel@nongnu.org; Wed, 01 Mar 2023 10:24:29 -0500 Received: by mail-wm1-x335.google.com with SMTP id k37so8866160wms.0 for ; Wed, 01 Mar 2023 07:24:24 -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=mkocC7TUPUcXj7ll+UawvcjBLr7Elh98/8Jity3e0Lo=; b=xACdqqHxQnILHAndgk8GRvdVp+IjQac3Hz8YUSo+1afLGVlYifP8tRysxJhGY6F36f eZHzwgJzLMYFOTMiVQgQYp/MLYMN22qYwUKHFjZlqNWHBl15daU+C3v1CjbLAkg0qKcm KKhJxZRxW7gnuns+P9hIeSgaZ1dz3RdEkGXvi4YpjagxPRWBNa1f0YnULbNbPWotY3kH tOqycUXimn+IXGPdB2DgWWX3peD0d2lJ65l8uBGOle7TZySrP9nkzWiuNKot39lb9PnA am+EV/ovmxkI4cUHH61bZuKAbmYfwSUdSengedWmH3EMy53A9L598q2BmhmK8a88dz9X pvqA== 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=mkocC7TUPUcXj7ll+UawvcjBLr7Elh98/8Jity3e0Lo=; b=KQJpK6syKN2GMAcNuiq3Aj4lVDmKU5XUHWBoxEJnNKzZRfoiI1539zzWvKn7Iybw8S B12oWLXDJkFp6WkghFeiEGTskLHlzrYSuzNys+PfvdoSYdPDne0kq+WCn/DVtAu7HmAV qD25yzIs3bjIjTLSVxuP+vzgw+dIv4QIXMYdhRd3JkXaWQ11E8ttx5pswND/KzCIu4s0 SgHh+HU7BBm/usqbwPfIntE7KmlntTaRjc8Xg1OGNVg2zE9IzG+8Xz/1FdcsHwRliJGh AcTrdsP3m5K1crFh4hZdZMp5yEbappd764dTaDRx3XX/nShqZHGJ5n8Hw9LjrKWA2GKU oegA== X-Gm-Message-State: AO0yUKUwsIDko5NRKOwRq9tCRhhHZlFj7pyEmc9anI7M9jGlVkISip01 IaRXNuMr5ImV52cYMpOn7cj1tw== X-Received: by 2002:a05:600c:511c:b0:3e8:35a2:6abf with SMTP id o28-20020a05600c511c00b003e835a26abfmr4942024wms.23.1677684263949; Wed, 01 Mar 2023 07:24:23 -0800 (PST) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id m34-20020a05600c3b2200b003df5be8987esm21926423wms.20.2023.03.01.07.24.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Mar 2023 07:24:23 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 74C601FFC7; Wed, 1 Mar 2023 15:16:06 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= , =?utf-8?q?Philippe_M?= =?utf-8?q?athieu-Daud=C3=A9?= , =?utf-8?q?Daniel_P_=2E_B?= =?utf-8?q?errang=C3=A9?= , Paolo Bonzini , Thomas Huth Subject: [PULL v2 17/24] configure: expose the direct container command Date: Wed, 1 Mar 2023 15:15:57 +0000 Message-Id: <20230301151604.1948813-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230301151604.1948813-1-alex.bennee@linaro.org> References: <20230301151604.1948813-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.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 In the process of migrating away from using docker.py to build our containers we need to expose the command to the build environment. The script is still a useful way to probe which command works though. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Daniel P. Berrangé Signed-off-by: Alex Bennée Message-Id: <20230228190653.1602033-18-alex.bennee@linaro.org> diff --git a/configure b/configure index 2a8a9be8a1..f5cfcd566e 100755 --- a/configure +++ b/configure @@ -1790,6 +1790,7 @@ fi # functions to probe cross compilers container="no" +runc="" if test $use_containers = "yes" && (has "docker" || has "podman"); then case $($python "$source_path"/tests/docker/docker.py probe) in *docker) container=docker ;; @@ -1798,6 +1799,7 @@ if test $use_containers = "yes" && (has "docker" || has "podman"); then esac if test "$container" != "no"; then docker_py="$python $source_path/tests/docker/docker.py --engine $container" + runc=$($python "$source_path"/tests/docker/docker.py probe) fi fi @@ -2397,6 +2399,7 @@ fi if test "$container" != no; then echo "ENGINE=$container" >> $config_host_mak + echo "RUNC=$runc" >> $config_host_mak fi echo "ROMS=$roms" >> $config_host_mak echo "MAKE=$make" >> $config_host_mak