From nobody Sat Nov 1 22:30:13 2025 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1509723354986270.26350263408403; Fri, 3 Nov 2017 08:35:54 -0700 (PDT) Received: from localhost ([::1]:37206 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAe0T-0000mh-3l for importer@patchew.org; Fri, 03 Nov 2017 11:35:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38126) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eAdya-0007xu-1s for qemu-devel@nongnu.org; Fri, 03 Nov 2017 11:33:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eAdyZ-000142-0p for qemu-devel@nongnu.org; Fri, 03 Nov 2017 11:33:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43942) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eAdyY-00011z-OA for qemu-devel@nongnu.org; Fri, 03 Nov 2017 11:33:42 -0400 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 mx1.redhat.com (Postfix) with ESMTPS id 7A0B949038; Fri, 3 Nov 2017 15:33:41 +0000 (UTC) Received: from t460.redhat.com (unknown [10.33.36.70]) by smtp.corp.redhat.com (Postfix) with ESMTP id E3F7C60560; Fri, 3 Nov 2017 15:33:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 7A0B949038 Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx09.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=berrange@redhat.com From: "Daniel P. Berrange" To: qemu-devel@nongnu.org Date: Fri, 3 Nov 2017 15:33:29 +0000 Message-Id: <20171103153333.6416-2-berrange@redhat.com> In-Reply-To: <20171103153333.6416-1-berrange@redhat.com> References: <20171103153333.6416-1-berrange@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 03 Nov 2017 15:33:41 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 1/5] build: allow setting a custom GIT binary for transparent proxying X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexey Kardashevskiy , Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_6 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Some users can't run a bare 'git' command, due to need for a transparent proxying solution such as 'tsocks'. This adds an argument to configure to let users specify such a thing: ./configure --with-git=3D"tsocks git" The submodule script is also updated to give the user a hint about using th= is flag, if we fail to checkout modules. Signed-off-by: Daniel P. Berrange Reviewed-by: Eric Blake --- Makefile | 4 ++-- configure | 5 +++++ scripts/git-submodule.sh | 29 ++++++++++++++++++++++++----- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index ec73acfa9a..d218f8f3c8 100644 --- a/Makefile +++ b/Makefile @@ -21,14 +21,14 @@ git-submodule-update: ifeq (0,$(MAKELEVEL)) git_module_status :=3D $(shell \ cd '$(SRC_PATH)' && \ - ./scripts/git-submodule.sh status $(GIT_SUBMODULES); \ + GIT=3D"$(GIT)" ./scripts/git-submodule.sh status $(GIT_SUBMODULES); \ echo $$?; \ ) =20 ifeq (1,$(git_module_status)) git-submodule-update: $(call quiet-command, \ - (cd $(SRC_PATH) && ./scripts/git-submodule.sh update $(GIT_SUBMO= DULES)), \ + (cd $(SRC_PATH) && GIT=3D"$(GIT)" ./scripts/git-submodule.sh upd= ate $(GIT_SUBMODULES)), \ "GIT","$(GIT_SUBMODULES)") endif endif diff --git a/configure b/configure index 285d123dbf..28ff481fe1 100755 --- a/configure +++ b/configure @@ -271,6 +271,7 @@ then else git_submodules=3D"" fi +git=3D"git" =20 # Don't accept a target_list environment variable. unset target_list @@ -1303,6 +1304,8 @@ for opt do ;; --enable-capstone=3Dsystem) capstone=3D"system" ;; + --with-git=3D*) git=3D"$optarg" + ;; *) echo "ERROR: unknown option $opt" echo "Try '$0 --help' for more information" @@ -5400,6 +5403,7 @@ echo "local state directory queried at runtime" echo "Windows SDK $win_sdk" fi echo "Source path $source_path" +echo "GIT binary $git" echo "GIT submodules $git_submodules" echo "C compiler $cc" echo "Host C compiler $host_cc" @@ -5591,6 +5595,7 @@ echo "extra_cxxflags=3D$EXTRA_CXXFLAGS" >> $config_ho= st_mak echo "extra_ldflags=3D$EXTRA_LDFLAGS" >> $config_host_mak echo "qemu_localedir=3D$qemu_localedir" >> $config_host_mak echo "libs_softmmu=3D$libs_softmmu" >> $config_host_mak +echo "GIT=3D$git" >> $config_host_mak echo "GIT_SUBMODULES=3D$git_submodules" >> $config_host_mak =20 echo "ARCH=3D$ARCH" >> $config_host_mak diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh index 08932a35f0..039f782d81 100755 --- a/scripts/git-submodule.sh +++ b/scripts/git-submodule.sh @@ -3,14 +3,27 @@ # This code is licensed under the GPL version 2 or later. See # the COPYING file in the top-level directory. =20 -set -e - substat=3D".git-submodule-status" =20 command=3D$1 shift modules=3D"$@" =20 +test -z "$GIT" && GIT=3Dgit + +error() { + echo "$0: $*" + echo + echo "Unable to automatically checkout GIT submodules '$modules'." + echo "If you require use of an alternative GIT binary (for example to" + echo "enable use of a transparent proxy), then please specify it by" + echo "running configure by with the '--with-git' argument. e.g." + echo + echo " $ ./configure --with-git=3D'tsocks git'" + echo + exit 1 +} + if test -z "$modules" then test -e $substat || touch $substat @@ -27,12 +40,18 @@ case "$command" in status) test -f "$substat" || exit 1 trap "rm -f ${substat}.tmp" EXIT - git submodule status $modules > "${substat}.tmp" + $GIT submodule status $modules > "${substat}.tmp" + test $? -ne 0 && error "failed to query git submodule status" diff "${substat}" "${substat}.tmp" >/dev/null exit $? ;; update) - git submodule update --init $modules 1>/dev/null - git submodule status $modules > "${substat}" + $GIT submodule update --init $modules 1>/dev/null + test $? -ne 0 && error "failed to update modules" + + $GIT submodule status $modules > "${substat}" + test $? -ne 0 && error "failed to save git submodule status" >&2 ;; esac + +exit 0 --=20 2.13.6