From patchwork Tue Oct 11 11:34:17 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: 614199 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp2627037pvb; Tue, 11 Oct 2022 06:22:56 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4SQmNJEOHJxPHgiBEiNpJ1VEpKn8IFyxY44dBIZAT0UuQdGP/NedMyT8f/cYcERqL8cGqK X-Received: by 2002:a05:6214:c29:b0:4b1:c69a:4729 with SMTP id a9-20020a0562140c2900b004b1c69a4729mr18231350qvd.12.1665494575909; Tue, 11 Oct 2022 06:22:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1665494575; cv=none; d=google.com; s=arc-20160816; b=mSmPtzb0NrI99RSztBsy9VSUCyxGOMYwtYgcToWB2tBUTpSN+IVLAW99l9wH9xEgNd pYQrTSHimkwP4IMTgZRgPk5Qmd1CnRx2sek1v7QCx7J617hoa9j5lpwCUJ5clJanM1FR P/ttUP968MZrx5OfrXBOr8L/PNa/ox3tcX9vxaolA7yWEiHwEwNS3idwLUHJ+Vkvxf1p VO62JdnwIUfvWQI4baBvovyF25wyoZUCia7UCw4hjQ/SLJXKk9PZbCXa+K/jsyC8BQjg +tfvBJ7oX/rBk012MN6SiVvmYwmPDDLFC9pgO0NvUvuGIZnKUYyEcpUOMV7Kjioj4Z6X qXQw== 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=Ux7WwgBmVw/vJ3sl2dviENLYf0GhlklJxjYn9aMfJVY=; b=RbgIDa/cuMDPBZPz/PJRjCklDszEFVV5PsjgZd2V6/XShBXY/7AnT7P7idSrEW5N5m D5vOziO/XXTcTA2wD3nJ7+MpAQprRKLujADw8WukR0uwiYbuxYUDwG42NGut1U08HlYJ wIjGB2DkYtaw3aRuqis2QtRk8VFrlQuM1TslfRFGLiR+hGplMMzsfibul98fltsR+6ZJ 60kRwU0T0hQ932I9Kkolcf1ky6PDyrNeVvOYlMeBkk1orLN6ao7j2PTa+Vbi+yKjthi+ oFNh8aDsK7Pn0lquAUAgdUazp2NDkIMWMxKHUXf9iVQfeE6WdVRUP6n0D1Pa6cGLA9K/ +61g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jO+a2ZDR; 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 bk17-20020a05620a1a1100b006ee8da2bb15si239994qkb.566.2022.10.11.06.22.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Oct 2022 06:22:55 -0700 (PDT) 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=jO+a2ZDR; 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]:53844 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oiFDj-0003rw-DH for patch@linaro.org; Tue, 11 Oct 2022 09:22:55 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49860) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oiDWi-0004dx-3v for qemu-devel@nongnu.org; Tue, 11 Oct 2022 07:34:24 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]:55048) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oiDWf-0004Ku-IA for qemu-devel@nongnu.org; Tue, 11 Oct 2022 07:34:22 -0400 Received: by mail-wm1-x32d.google.com with SMTP id iv17so8414349wmb.4 for ; Tue, 11 Oct 2022 04:34:20 -0700 (PDT) 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=Ux7WwgBmVw/vJ3sl2dviENLYf0GhlklJxjYn9aMfJVY=; b=jO+a2ZDRS6aVoJR9oNZDjnifpeIu4NjbqyBOwGlD4ilQDjRgfwSvSPW1hBMRbbMCxx BCok4YnOkBjaa3LLFnVFuRK/HR2B71AYGau/9/Dfu2mmklJtMIqI65fKG4qrioak374z JfLHfZTezpI9WfBqY6qK/yjFpxpKdLvVALmnxfzoEzNi7DSRPj8M4I4RWReX7JfYX4zI CZcYuu710DgviveaK7+9g1NGd2zVavdmoizw2VWiWMLvU2rlUTh3Rp7QIsVuu7ckpM3i 5I+fEqnx4T9645z8/uXabn3C9TpcyaGi79BexlFkQtq+fW6Ok1qcnKd29hZYA3FUuroz 5wqg== 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=Ux7WwgBmVw/vJ3sl2dviENLYf0GhlklJxjYn9aMfJVY=; b=dHn0ib2x43PvsFxX/TXMlRnUIXp4Da5BOzveUJnBpiFuKJw+pyQNKsH2AkVXwn/Bnb mkrDJVquB3xPP9gTq09xh7SpuhDfLT64xYaABq+GfaQlckRwzvhdtM9pySfRLNhU2piF u8SonVqIdFwA1dT3E7qt23U+P5j/TddBedxAiZlkNEksnlIS3w5tsC6n8C3XjydeFIRy R2R3C7ivTJLhXgV31utqYb307cSWfMK6UDHxkAI8zYCcD2FQ12ULCN7oX3SDgI+LlwG7 5P0V4wFmOxw0qVoh58wGAldLiHRZP3RLhhhFX75Cnt6cOg20hPNJCMRqEfA6NsIT7Z9Y 3PCQ== X-Gm-Message-State: ACrzQf2QG1K69P8tFvrbh0Cu/RwmmtFyONaxYyWROX4N1tFQhRJTKgsQ YwKb7X4CWBc4iFRgu/n8k6a1DQ== X-Received: by 2002:a05:600c:4f11:b0:3b4:bf6c:4566 with SMTP id l17-20020a05600c4f1100b003b4bf6c4566mr23176322wmq.34.1665488059904; Tue, 11 Oct 2022 04:34:19 -0700 (PDT) Received: from zen.linaroharston ([185.81.254.11]) by smtp.gmail.com with ESMTPSA id t15-20020a5d49cf000000b0022dc6e76bbdsm11252680wrs.46.2022.10.11.04.34.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Oct 2022 04:34:18 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D89101FFBC; Tue, 11 Oct 2022 12:34:17 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org, aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com, crosa@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v1 4/4] configure: expose the direct container command Date: Tue, 11 Oct 2022 12:34:17 +0100 Message-Id: <20221011113417.794841-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221011113417.794841-1-alex.bennee@linaro.org> References: <20221011113417.794841-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32d.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" 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. Signed-off-by: Alex Bennée --- configure | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configure b/configure index 45ee6f4eb3..5484ed2568 100755 --- a/configure +++ b/configure @@ -1778,6 +1778,7 @@ fi # functions to probe cross compilers container="no" +runc="" if test $use_containers = "yes"; then case $($python "$source_path"/tests/docker/docker.py probe) in *docker) container=docker ;; @@ -1786,6 +1787,7 @@ if test $use_containers = "yes"; 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 @@ -2380,6 +2382,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