From patchwork Wed Sep 4 20:29:33 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: 173028 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp414837ilq; Wed, 4 Sep 2019 13:39:27 -0700 (PDT) X-Google-Smtp-Source: APXvYqx0WvdOXhitvZcMgksbLNF/+ojgFmIQlaG45Kka2/YiZS3FMZaxuZHp6eVSe1+32Ywjqb5/ X-Received: by 2002:a37:8ec7:: with SMTP id q190mr40385672qkd.157.1567629567511; Wed, 04 Sep 2019 13:39:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567629567; cv=none; d=google.com; s=arc-20160816; b=iRP64nc/HHskwCUbMErTXGhuqmcFZMoYNULdMgFo8/hkGySgw8VMBlL/1NzbXcVxXw HOLr3CvAEzwfeoLmX1iJog9XUGwMZjmK0idODlI/pZ4F/su5h+DfjxK5Afz+aIaiNc1S e8MtLDG4JRIIYe6tyKd92Gl848B+nhtnns7MCMG0ljvPAmdLV6iNolcKcSE5X7FmS+mB 0pE6kLfHX71Cl+TKaZ+XcKm/TdHkNC0Tg/LzEkM2hTyymrsCsD0fjx/5mVRC1+LHyC9R /NdFO2tglH+ZThX6AZoN7RgmNdXaoVqdpvSDyJDnY72Ko0bzTBlw3nuznjJMZNEex8z4 r5lg== 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=Bl9ihYzO31h1s8ixDSGDQc1ywiHdznbrQuxAbSXVm60=; b=u58ehgz0JBotdrn+M2L4E07UYdb8cr8TNaqjNzHqhZQemh4ATb3L1jMzCnf5rzWI9t 851BH4mwwW6yN8+e8DmmyCV/mVfiwAkw0CTupFp8/BSyWNHwBbL7bujafHNw5NF2tAPX s6OocgvB6/OkNS7ibxGMQIikZbTUX8uCH7nUyA18ZNW7BbI1WsDk0qlu+uQmGz8ALPgi odzpEC6lfocvlOAzK6SPVdm1QM/WiI0MVtQcA1M8MjmrSGUBHv0/IknzwFtHnKiPoaZ0 bFkTKdN7td8QqWai6dK+51m20GaRKn5W0lKaOTrc0oR9h55DQPjTWp+AwhjygoIv7547 bhpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=PHKa70Go; 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 c8si17358qve.209.2019.09.04.13.39.27 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Sep 2019 13:39: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=PHKa70Go; 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]:39122 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5c3q-0000OI-Dk for patch@linaro.org; Wed, 04 Sep 2019 16:39:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49671) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i5bv7-00087P-Dq for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i5bv3-0006WD-5N for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:24 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:36559) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i5bv0-0006Tq-Bq for qemu-devel@nongnu.org; Wed, 04 Sep 2019 16:30:19 -0400 Received: by mail-wm1-x32a.google.com with SMTP id p13so219948wmh.1 for ; Wed, 04 Sep 2019 13:30:16 -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=Bl9ihYzO31h1s8ixDSGDQc1ywiHdznbrQuxAbSXVm60=; b=PHKa70GoOt1ksj6K7Pm57YYEZXh2NY+KMfCeGOCxUuEC1KsBWhso8V3imC1lo5/it2 3L0IPQiDaTjjo6ommUF5i40l+Y5+cAw8WUzDK4MCpGDq+h4v616oy/uaOmi7rJLuovVz y8TET4QanafUn7EpUAknlA2/noDqzuQJj4pSHC8ZRFZnKHnSnBUWp0H49NYNnXXNkJYj ReUyo/FZfNBe/vMl3omHAcRTsM2edX/P1l49B67UMQ7PeaekBG097Z8ZmC17fGpBtLg1 6dO7tWMCNdYKWbkU2AyAxbMPwc8LZIYSEUzhcvxJI5vzP5bWFO9snYUvssh/fj7BzVAk c9hA== 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=Bl9ihYzO31h1s8ixDSGDQc1ywiHdznbrQuxAbSXVm60=; b=B+QqNN58y53RKv/EVhuu80e6x++XEaKOzHXtdlVkT+MPzslNOUAaHIjko/xy3V34OJ 0GJyrlxYa+UI9vjOh1BP5Wb24yVj8YxmnGIScYK+rMo+7JQDoDVIhTKhruzhpUiVKURX J7JH4zf9uZRAVwmW/ph2SYRUrdpHFENpH4Uwg1QYSAaKsLCsrux2ZMgkCuxDE9Ct0Q09 K97pfhWNwdu25F/jZ/4gJ/onSUL2kcQIIKudCd4bedHu+Gp+cvrRr4TBEQfbyaEW6Jm0 26b8UYUnxo3c0kItNcxxv++9q/jfL6rz9JEH+gxkK6FWV0mapY1CgzScxrxdi2C5dvlF 3ENg== X-Gm-Message-State: APjAAAUehuQxrmekPMm2nVUOzzx7jF8ogk2zFlgPzyXxogz5DW02XA2S HJSKi+nxI/ziK0EfqCEzZC5ZGw== X-Received: by 2002:a1c:9ec9:: with SMTP id h192mr82931wme.105.1567629015091; Wed, 04 Sep 2019 13:30:15 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id j1sm16570133wrg.24.2019.09.04.13.30.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2019 13:30:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 8408C1FF8F; Wed, 4 Sep 2019 21:30:13 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Wed, 4 Sep 2019 21:29:33 +0100 Message-Id: <20190904203013.9028-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190904203013.9028-1-alex.bennee@linaro.org> References: <20190904203013.9028-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::32a Subject: [Qemu-devel] [PATCH v1 02/42] 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@euphon.net, berrange@redhat.com, stefanb@linux.vnet.ibm.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, stefanha@redhat.com, marcandre.lureau@redhat.com, pbonzini@redhat.com, aurelien@aurel32.net 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. Signed-off-by: Alex Bennée --- configure | 10 +++++----- tests/docker/docker.py | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) -- 2.20.1 Tested-by: David Hildenbrand 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)