From patchwork Tue Sep 10 08:43:06 2019 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: 173445 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5499361ilq; Tue, 10 Sep 2019 01:44:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqz5+ZT2hf7NX30rzAYi3MTUeUFIHa1G/2kt20XG/PzK2P0xpZqfai0efxR+i7xb8SFDT3EY X-Received: by 2002:a50:fd96:: with SMTP id o22mr24929230edt.218.1568105067574; Tue, 10 Sep 2019 01:44:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568105067; cv=none; d=google.com; s=arc-20160816; b=sjj8LnUFI0ePw9/dlgD+OI8urPqd51EPtMpUoeCnhYOmxT0diRYSP5sgjkyCva+ozC D7TRFNHUiVZM2L33ZoZh+puwYsM31Z2wf2zLZceSQYbnAc6E2SXJVS+EjBhS6ZxITHrZ +97nzdoLwUXgVnjonCyE8hZdPiTVv3o9AFWwO+gmjjB6LkSjICf6PdzT6m/5Wh/Uq1kw U/+ka6hrg+Yv4avg3F4pGZxYqsSzWEa1M6lSYN6FUdGSk3HIEM8HBbQEBnZwic2jFDfn ZidtMksk3v+HCa8ua4N0+Pkk13wgRwjBtSMRY7/3z3uQoUFH02AuDIiE0GD2LHNSF6H+ 2ezQ== 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:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=0Lr8Rspy6mGDHTxemrpnhcEpoVqVML2BOuqqGvyKoTM=; b=LjclgAFFtf2jpOcIwX2jyZIdMM5jDlrJ5IuuaSCAqxg1kzfhNWfNuFWaj6AxsSivgy BylnPbqpRAOBIgt9ZF3eWI4YFIF7IdCiz1rAVih4o2if+Vf7dwqtSkt+tLMwLtBQ6EwG jM3oqoT46uS870SCCLvwcEAHel7MRcVMdwxiiXdidQf0HxzVaGVqsHa4p3Lo9vnI3fXN ejweh7Vzj5kuXj5WpLhRnvGcbgnYpVXVZJi1JKB9zZqdhqDM46f8hsBCvC1NQFTXPSP+ gulw8Cho5RgHZeGtCle7STGxK3P16CWPePX8kWQ8H0XxXpzUx8G/OGYhgmzmv4OpBorR pNUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=oHpVkJ8G; 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 f43si11483661edf.422.2019.09.10.01.44.27 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 01:44:27 -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=fail header.i=@linaro.org header.s=google header.b=oHpVkJ8G; 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]:35554 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7blB-0003M4-R0 for patch@linaro.org; Tue, 10 Sep 2019 04:44:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35767) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bki-0003KU-L0 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bkh-0006Hb-FX for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:56 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:44340) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bkg-0006GB-15 for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:54 -0400 Received: by mail-wr1-x42a.google.com with SMTP id k6so6224083wrn.11 for ; Tue, 10 Sep 2019 01:43:53 -0700 (PDT) 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=0Lr8Rspy6mGDHTxemrpnhcEpoVqVML2BOuqqGvyKoTM=; b=oHpVkJ8GqujKUnI3zOPCEopU9M4QyGs9+KOQozb2X15VzPZfHfVuSX4Pk4iXddOL3l slD93TBYWvmQT1S/yqMw0c7HSf16XPWZBAUR79GQzerCG+tHWJknRr3Q8C77i8VzIXGZ zvOBaomUWJWBMGhQ0H6uPtT8eirqRln8ouVmVw/MDUlVOS8vKazYp/UL37IxESQbedeF 7Fnas/baBidIL1VdPS8zKd1J2qebFDur1fbLQzu0MsyQ18Bso83tV82yO8xCvqDnmeIY HVve/yCHiB/QBmuuVQl7SYnE2poUkXpBYzBuHdVQXOGMY82wAN5aQ9lDdLfALt6xTCfq y2DQ== 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=0Lr8Rspy6mGDHTxemrpnhcEpoVqVML2BOuqqGvyKoTM=; b=Idj7aWt5eUNtFVS88L3NUHFTH60+jxPlgrdZwUeByuWYDGxoedc/guFWcnOQzRkog1 WyeN8W5NVC0jdPKFoqKXu105ISwEPdCljF6oBU3d7LtA7L7Ik+w06xtRciBj4yOk+WvA 5hg4DUc0E7aiFkGWfJ2tEE1NRC7Ts3Nt6/MYtxYQdHHvw+ozQsQy8uoCSinh1iIWULre pbbqdVrV1ak8bT9dZyhW7gYWHo/NZr0cgPZ0XPxuW2vsv2WH3E09hrll55jDhGuionbz lmvFJ0XpRQGT6s3ab6CHPxrI1LQRSXELrNfe1PSMmStkclZDokYpryOD177DQUjw30um EIgw== X-Gm-Message-State: APjAAAVE+wCkmezlRF3ZzNiztNO3ajaQcvt+m6M84JDvqXHvhTjd3hyN 1YC94IutRflm2aatXYLVBQWCBQ== X-Received: by 2002:a5d:428c:: with SMTP id k12mr25064614wrq.196.1568105030831; Tue, 10 Sep 2019 01:43:50 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b144sm2446435wmb.3.2019.09.10.01.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:43:50 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9B0B81FF8F; Tue, 10 Sep 2019 09:43:49 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:06 +0100 Message-Id: <20190910084349.28817-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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::42a Subject: [Qemu-devel] [PULL 02/45] configure: clean-up container cross compile detect 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 , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org, David Hildenbrand Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The introduction of podman support inadvertently broke configure's detect of the container support as the configure probe didn't specify an engine type. To fix this in docker.py: - only (re)set USE_ENGINE if --engine is specified - enhance the output so docker is no longer just yes In the configure script we can at least start cleaning up the detecting and naming of variables. To avoid too much churn the conversion of the various make DOCKER_foo variables has been left for future clean-ups. Fixes: 9459f754134b Signed-off-by: Alex Bennée Tested-by: David Hildenbrand -- 2.20.1 diff --git a/configure b/configure index 95134c0180b..94845fc5101 100755 --- a/configure +++ b/configure @@ -495,7 +495,7 @@ qed="yes" parallels="yes" sheepdog="yes" libxml2="" -docker="no" +container="no" debug_mutex="no" libpmem="" default_devices="yes" @@ -5894,14 +5894,14 @@ EOF fi ########################################## -# Docker and cross-compiler support +# Container based cross-compiler support # # This is specifically for building test # cases for foreign architectures, not # cross-compiling QEMU itself. -if has "docker"; then - docker=$($python $source_path/tests/docker/docker.py probe) +if has "docker" || has "podman"; then + container=$($python $source_path/tests/docker/docker.py probe) fi ########################################## @@ -6474,7 +6474,7 @@ echo "qed support $qed" echo "parallels support $parallels" echo "sheepdog support $sheepdog" echo "capstone $capstone" -echo "docker $docker" +echo "container support $container" echo "libpmem support $libpmem" echo "libudev $libudev" echo "default devices $default_devices" diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 4bba29e104e..e23209f71ee 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -536,9 +536,9 @@ class ProbeCommand(SubCommand): try: docker = Docker() if docker._command[0] == "docker": - print("yes") + print("docker") elif docker._command[0] == "sudo": - print("sudo") + print("sudo docker") elif docker._command[0] == "podman": print("podman") except Exception: @@ -651,7 +651,8 @@ def main(): cmd.args(subp) subp.set_defaults(cmdobj=cmd) args, argv = parser.parse_known_args() - USE_ENGINE = args.engine + if args.engine: + USE_ENGINE = args.engine return args.cmdobj.run(args, argv)