From patchwork Thu Nov 28 15:35:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 180460 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp379765ile; Thu, 28 Nov 2019 08:57:23 -0800 (PST) X-Google-Smtp-Source: APXvYqy//JoLNftibDpd2CKG+986jogE73o7QYl/8NhZKa33IWC7X5oOhYaOYPPC8FkhOBow8Y5E X-Received: by 2002:aa7:d3d0:: with SMTP id o16mr1068769edr.102.1574960243425; Thu, 28 Nov 2019 08:57:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574960243; cv=none; d=google.com; s=arc-20160816; b=IFlpCS2whWqDCOn7YgRLNQcELM14SX0wnhdOBXQAK7qcw2OfewhZ15jSfNiHc7Fy6G F1jrQU2obvCOBpG5xe9k50xSf7tnJ9Ka9Ncx95hDrtEQfkomvwO+PfAKNa4VGtbxcsv3 HkYMw8ZG9Xjj1qtJ+JUo/uDAEGBFMonLgsH+vPkrP8APXesUP87tmQNfj/G7Y0xkG48B Z4fcccJckFPmOPKMEuwSIVz7NfsarJILt/IKq+eNw88WCo+6dOgPFtF1qfZ7BxhOFmB9 VSAO/5vJ/uc8MpD6oTsyB/X7tZeSUjjFcDPylbLUsA7dIiwPjj88gLyhD8CTuSswHzc1 MMcw== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=ky4mgUkth1VGZLMbQpI8WowaMsYghd71kTf+NNV3KVA=; b=tKJMKg6Ee9U6yUhkzID+16tf6qH4pkgw2z3OdVvvdXom0wIrLJwCoxrpgTB1ofT20x 4jMrQ3SeLOhwOj/uZQDTKLv/OgIhZtEeoc/hv+U9iPFzASSO/hFbfzVAHLRNDLUTeQ/g LhZq5MUvDKx16CZvVcD60x8arH6u3B39bdQaobPjQ+WNaB0Sz572a8glbmlUAHPK/4MI 1zXKJ7N3T3lNlJkrxn4WrB32cTSMTcfcG2SQ3Q3TVEr2DgXWkIimmlz/v3BewQ9LPa2Y P1b8O0DvqB0mOsZeTApRJrDvs8QkYzwm4Gooa+O+X9ZysDLxff5GtyB1hf0Dxx3SpAPL PHBg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b="eX5/whJR"; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id dd11si5961900ejb.177.2019.11.28.08.57.23 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Nov 2019 08:57:23 -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=fail header.i=@redhat.com header.s=mimecast20190719 header.b="eX5/whJR"; 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=redhat.com Received: from localhost ([::1]:51028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaN6V-0007pr-Bz for patch@linaro.org; Thu, 28 Nov 2019 11:57:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:50223) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iaLpX-0002jL-HR for qemu-devel@nongnu.org; Thu, 28 Nov 2019 10:35:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iaLpS-0005Xw-V7 for qemu-devel@nongnu.org; Thu, 28 Nov 2019 10:35:40 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:39114 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iaLpS-0005Qv-Lz for qemu-devel@nongnu.org; Thu, 28 Nov 2019 10:35:38 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1574955337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ky4mgUkth1VGZLMbQpI8WowaMsYghd71kTf+NNV3KVA=; b=eX5/whJRN8IrWfE6Sy0rOH1iJgOESmQyhPg6OAXcnMoE/gJQwqwJDt70bFA5rVD/umz+z7 03HrvOoid8uCKJATFv75a3uauMnVZyozVY6NHACMaFfiUVdpLc5ha36wA21mM61Iysxyuj Lnh2PPksQg7XsVDRv7fsOp3bYh4YFAE= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-393-ej2vlZpzO6G-Cee_2ZFhRQ-1; Thu, 28 Nov 2019 10:35:34 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D4BA756B3D; Thu, 28 Nov 2019 15:35:32 +0000 (UTC) Received: from thuth.com (ovpn-116-114.ams2.redhat.com [10.36.116.114]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7C6F010001BD; Thu, 28 Nov 2019 15:35:31 +0000 (UTC) From: Thomas Huth To: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [PATCH v2 1/2] configure: allow disable of cross compilation containers Date: Thu, 28 Nov 2019 16:35:24 +0100 Message-Id: <20191128153525.2646-2-thuth@redhat.com> In-Reply-To: <20191128153525.2646-1-thuth@redhat.com> References: <20191128153525.2646-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-MC-Unique: ej2vlZpzO6G-Cee_2ZFhRQ-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: Stefan Weil , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Alex Bennée Our docker infrastructure isn't quite as multiarch as we would wish so lets allow the user to disable it if they want. This will allow us to use still run check-tcg on non-x86 CI setups. Signed-off-by: Alex Bennée --- configure | 8 +++++++- tests/tcg/configure.sh | 6 ++++-- 2 files changed, 11 insertions(+), 3 deletions(-) -- 2.18.1 Reviewed-by: Stefan Weil diff --git a/configure b/configure index 6099be1d84..fe6d0971f1 100755 --- a/configure +++ b/configure @@ -302,6 +302,7 @@ audio_win_int="" libs_qga="" debug_info="yes" stack_protector="" +use_containers="yes" if test -e "$source_path/.git" then @@ -1539,6 +1540,10 @@ for opt do ;; --disable-plugins) plugins="no" ;; + --enable-containers) use_containers="yes" + ;; + --disable-containers) use_containers="no" + ;; *) echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information" @@ -1722,6 +1727,7 @@ Advanced options (experts only): track the maximum stack usage of stacks created by qemu_alloc_stack --enable-plugins enable plugins via shared library loading + --disable-containers don't use containers for cross-building Optional features, enabled with --enable-FEATURE and disabled with --disable-FEATURE, default is enabled if available: @@ -8039,7 +8045,7 @@ done (for i in $cross_cc_vars; do export $i done -export target_list source_path +export target_list source_path use_containers $source_path/tests/tcg/configure.sh) # temporary config to build submodules diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh index 6c4a471aea..210e68396f 100755 --- a/tests/tcg/configure.sh +++ b/tests/tcg/configure.sh @@ -36,8 +36,10 @@ TMPC="${TMPDIR1}/qemu-conf.c" TMPE="${TMPDIR1}/qemu-conf.exe" container="no" -if has "docker" || has "podman"; then - container=$($python $source_path/tests/docker/docker.py probe) +if test $use_containers = "yes"; then + if has "docker" || has "podman"; then + container=$($python $source_path/tests/docker/docker.py probe) + fi fi # cross compilers defaults, can be overridden with --cross-cc-ARCH