From patchwork Wed Dec 4 15:46:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 180807 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp798245ile; Wed, 4 Dec 2019 08:08:55 -0800 (PST) X-Google-Smtp-Source: APXvYqwiYtuqC6M1xK2226fKIPjCaO55yMDgijI9L6zfkpZsERMB3aUE1BgRTY5bmCk3YGJ/NYcg X-Received: by 2002:a17:906:941:: with SMTP id j1mr3866905ejd.185.1575475735241; Wed, 04 Dec 2019 08:08:55 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575475735; cv=none; d=google.com; s=arc-20160816; b=01XiQbyrOMyZTGlntgVhfrxKAzdf9Tjs/C2yHMkydX8ClKkSEraWRJ5R9JlqqlWhHl 9Z+G8ZU30Q/+FVKb8S644Vb3hMWem6MnTReqhHx3Ket8zTYTgTVSnvJ3bEPZK/d0DQnA 9HkbyMcNHVXYhdNRkCRCPCplNDNosmt1FS8vfLKoeFcKdvCv6Fm1rHbzk0D06QbygXWS IY0edHXYQTI23SSeZya77hgQQy1KV76XNk8JzC52QbqvF6rE7VWLgz/APvLJMYd/7+vA EUGPSsybOTT1EquD73LO2/7QmanWwrDx2Ih1phrMgjIm2FR3YxvL1x/Wzg+p7BImQysH KUIg== 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=SsOzM8MNH4R58D2tLbl4GOaOBXqI7tFgk7eGtkoiEOQ=; b=RA8FxPaj/yKGjnSHnkN2TEfMj55IOrMJ+OX2KB5Xj6kBYHThRdTsG9Kz9bt0cX4YWr 5HRDXPzH2Y67JqlU+GvauUkYRqrmkndYVAmqFiZgf6qCrrhmfon0gSiWab9wdcccFaQg tCGNxd2WFmdAvOUhL+b3DqreMyagnWWTKFSNF2X2Y79D8xIPs9vCnen2yt2Zgr9kDX1L Ubkapwf/z72PWD2BKTYk5WnnAkS/aZZ8tv/Jw9e99kcL/51nuIAwcpkZB42Z1iiKP96p Ip3FACWA5sg9BYzewjt9OAumEMP+tlGrce6AUSgKD0BRKmquspZmZ3bUtqEY28xrmJHi UsCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@redhat.com header.s=mimecast20190719 header.b=aKZdEKRG; 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 f26si4822119ejc.255.2019.12.04.08.08.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 04 Dec 2019 08:08:55 -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=aKZdEKRG; 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]:40798 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icXCv-0003Oe-US for patch@linaro.org; Wed, 04 Dec 2019 11:08:53 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56161) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1icWrt-0007Ud-8w for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:47:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1icWrs-0000RM-17 for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:47:09 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:51177 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 1icWrq-0000FB-1f for qemu-devel@nongnu.org; Wed, 04 Dec 2019 10:47:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575474417; 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=SsOzM8MNH4R58D2tLbl4GOaOBXqI7tFgk7eGtkoiEOQ=; b=aKZdEKRGxipU8H+kpoXT8HP5A8lsi1RzeTUb8Q24VXSdK9ZQ2LdIdi8Fkv+gi+aVpYAYHp m+6/r0mg4mETS5FRD5QsPBkzzl+zU1sJqNJXRwcntLlBxeKVPTKV1RG95fg1qDeF7J9+QR 4iE3A0F9zBiyAHy3b8YjkBb6JY2IP54= 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-431-sNYFBhfxNIeWPziF3ZagWg-1; Wed, 04 Dec 2019 10:46:55 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0B9361005502; Wed, 4 Dec 2019 15:46:54 +0000 (UTC) Received: from thuth.com (ovpn-117-39.ams2.redhat.com [10.36.117.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2C306600C8; Wed, 4 Dec 2019 15:46:52 +0000 (UTC) From: Thomas Huth To: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Subject: [PATCH v2 6/7] configure: allow disable of cross compilation containers Date: Wed, 4 Dec 2019 16:46:17 +0100 Message-Id: <20191204154618.23560-7-thuth@redhat.com> In-Reply-To: <20191204154618.23560-1-thuth@redhat.com> References: <20191204154618.23560-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: sNYFBhfxNIeWPziF3ZagWg-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: qemu-block@nongnu.org, Christian Ehrhardt , Eric Auger , Wainer dos Santos Moschetta , Cleber Rosa , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , David Gibson 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 let's 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 Reviewed-by: Stefan Weil Signed-off-by: Thomas Huth --- configure | 8 +++++++- tests/tcg/configure.sh | 6 ++++-- 2 files changed, 11 insertions(+), 3 deletions(-) -- 2.18.1 Reviewed-by: Cleber Rosa Tested-by: Cleber Rosa 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