* [Qemu-devel] [PATCH] build: allow setting a custom GIT binary for transparent proxying
@ 2017-10-20 14:10 Daniel P. Berrange
2017-10-20 20:06 ` Eric Blake
2017-10-20 22:31 ` Philippe Mathieu-Daudé
0 siblings, 2 replies; 4+ messages in thread
From: Daniel P. Berrange @ 2017-10-20 14:10 UTC (permalink / raw)
To: qemu-devel; +Cc: Peter Maydell, Chen, Farrah, Daniel P. Berrange
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="tsocks git"
The submodule script is also updated to give the user a hint about using this
flag, if we fail to checkout modules.
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
Makefile | 4 ++--
configure | 5 +++++
scripts/git-submodule.sh | 30 +++++++++++++++++++++++++-----
3 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/Makefile b/Makefile
index 9372742f86..4c9d0eaef2 100644
--- a/Makefile
+++ b/Makefile
@@ -21,14 +21,14 @@ git-submodule-update:
ifeq (0,$(MAKELEVEL))
git_module_status := $(shell \
cd '$(SRC_PATH)' && \
- ./scripts/git-submodule.sh status $(GIT_SUBMODULES); \
+ GIT="$(GIT)" ./scripts/git-submodule.sh status $(GIT_SUBMODULES); \
echo $$?; \
)
ifeq (1,$(git_module_status))
git-submodule-update:
$(call quiet-command, \
- (cd $(SRC_PATH) && ./scripts/git-submodule.sh update $(GIT_SUBMODULES)), \
+ (cd $(SRC_PATH) && GIT="$(GIT)" ./scripts/git-submodule.sh update $(GIT_SUBMODULES)), \
"GIT","$(GIT_SUBMODULES)")
endif
endif
diff --git a/configure b/configure
index 6f21aaf989..ce5a2d0105 100755
--- a/configure
+++ b/configure
@@ -271,6 +271,7 @@ then
else
git_submodules=""
fi
+git="git"
# Don't accept a target_list environment variable.
unset target_list
@@ -1294,6 +1295,8 @@ for opt do
error_exit "vhost-user isn't available on win32"
fi
;;
+ --with-git=*) git="$optarg"
+ ;;
*)
echo "ERROR: unknown option $opt"
echo "Try '$0 --help' for more information"
@@ -5338,6 +5341,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"
@@ -5528,6 +5532,7 @@ echo "extra_cxxflags=$EXTRA_CXXFLAGS" >> $config_host_mak
echo "extra_ldflags=$EXTRA_LDFLAGS" >> $config_host_mak
echo "qemu_localedir=$qemu_localedir" >> $config_host_mak
echo "libs_softmmu=$libs_softmmu" >> $config_host_mak
+echo "GIT=$git" >> $config_host_mak
echo "GIT_SUBMODULES=$git_submodules" >> $config_host_mak
echo "ARCH=$ARCH" >> $config_host_mak
diff --git a/scripts/git-submodule.sh b/scripts/git-submodule.sh
index 08932a35f0..c66567d409 100755
--- a/scripts/git-submodule.sh
+++ b/scripts/git-submodule.sh
@@ -3,14 +3,19 @@
# This code is licensed under the GPL version 2 or later. See
# the COPYING file in the top-level directory.
-set -e
-
substat=".git-submodule-status"
command=$1
shift
modules="$@"
+test -z "$GIT" && GIT=git
+
+error() {
+ printf "$0: %s\n" "$*" >&2
+ exit 1
+}
+
if test -z "$modules"
then
test -e $substat || touch $substat
@@ -27,12 +32,27 @@ 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
+ if test $? -ne 0 ; then
+ 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='tsocks git'"
+ echo
+ exit 1
+ fi
+ $GIT submodule status $modules > "${substat}"
+ test $? -ne 0 && error "failed to save git submodule status"
;;
esac
+
+exit 0
--
2.13.6
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] build: allow setting a custom GIT binary for transparent proxying
2017-10-20 14:10 [Qemu-devel] [PATCH] build: allow setting a custom GIT binary for transparent proxying Daniel P. Berrange
@ 2017-10-20 20:06 ` Eric Blake
2017-10-23 8:42 ` Daniel P. Berrange
2017-10-20 22:31 ` Philippe Mathieu-Daudé
1 sibling, 1 reply; 4+ messages in thread
From: Eric Blake @ 2017-10-20 20:06 UTC (permalink / raw)
To: Daniel P. Berrange, qemu-devel; +Cc: Peter Maydell, Chen, Farrah
[-- Attachment #1: Type: text/plain, Size: 1635 bytes --]
On 10/20/2017 09:10 AM, Daniel P. Berrange wrote:
> 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="tsocks git"
>
> The submodule script is also updated to give the user a hint about using this
> flag, if we fail to checkout modules.
Does my hint about using 'git config url.XYZ.insteadof git://...' do the
trick without needing this patch?
>
> Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> ---
> Makefile | 4 ++--
> configure | 5 +++++
> scripts/git-submodule.sh | 30 +++++++++++++++++++++++++-----
> 3 files changed, 32 insertions(+), 7 deletions(-)
>
> +++ b/scripts/git-submodule.sh
> @@ -3,14 +3,19 @@
> # This code is licensed under the GPL version 2 or later. See
> # the COPYING file in the top-level directory.
>
> -set -e
> -
Is the change of dropping 'set -e' and adding 'error' worth doing as an
independent patch?
> substat=".git-submodule-status"
> update)
> - git submodule update --init $modules 1>/dev/null
> - git submodule status $modules > "${substat}"
> + $GIT submodule update --init $modules 1>/dev/null
style of whether 1> or plain > is sufficient.
But in spite of my comments, the patch looks correct. So if we agree
that we want it, you can add:
Reviewed-by: Eric Blake <eblake@redhat.com>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 619 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] build: allow setting a custom GIT binary for transparent proxying
2017-10-20 14:10 [Qemu-devel] [PATCH] build: allow setting a custom GIT binary for transparent proxying Daniel P. Berrange
2017-10-20 20:06 ` Eric Blake
@ 2017-10-20 22:31 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2017-10-20 22:31 UTC (permalink / raw)
To: Daniel P. Berrange, qemu-devel; +Cc: Peter Maydell, Chen, Farrah
Hi Daniel,
> diff --git a/configure b/configure
> index 6f21aaf989..ce5a2d0105 100755
> --- a/configure
> +++ b/configure
> @@ -271,6 +271,7 @@ then
> else
> git_submodules=""
> fi
> +git="git"
>
> # Don't accept a target_list environment variable.
> unset target_list
> @@ -1294,6 +1295,8 @@ for opt do
> error_exit "vhost-user isn't available on win32"
> fi
> ;;
> + --with-git=*) git="$optarg"
> + ;;
> *)
> echo "ERROR: unknown option $opt"
> echo "Try '$0 --help' for more information"
> @@ -5338,6 +5341,7 @@ echo "local state directory queried at runtime"
> echo "Windows SDK $win_sdk"
> fi
> echo "Source path $source_path"
> +echo "GIT binary $git"
"GIT command"
> echo "GIT submodules $git_submodules"
> echo "C compiler $cc"
> echo "Host C compiler $host_cc"
> @@ -5528,6 +5532,7 @@ echo "extra_cxxflags=$EXTRA_CXXFLAGS" >> $config_host_mak
> echo "extra_ldflags=$EXTRA_LDFLAGS" >> $config_host_mak
> echo "qemu_localedir=$qemu_localedir" >> $config_host_mak
> echo "libs_softmmu=$libs_softmmu" >> $config_host_mak
> +echo "GIT=$git" >> $config_host_mak
> echo "GIT_SUBMODULES=$git_submodules" >> $config_host_mak
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] build: allow setting a custom GIT binary for transparent proxying
2017-10-20 20:06 ` Eric Blake
@ 2017-10-23 8:42 ` Daniel P. Berrange
0 siblings, 0 replies; 4+ messages in thread
From: Daniel P. Berrange @ 2017-10-23 8:42 UTC (permalink / raw)
To: Eric Blake; +Cc: qemu-devel, Peter Maydell, Chen, Farrah
On Fri, Oct 20, 2017 at 03:06:58PM -0500, Eric Blake wrote:
> On 10/20/2017 09:10 AM, Daniel P. Berrange wrote:
> > 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="tsocks git"
> >
> > The submodule script is also updated to give the user a hint about using this
> > flag, if we fail to checkout modules.
>
> Does my hint about using 'git config url.XYZ.insteadof git://...' do the
> trick without needing this patch?
IIUC, that only works if the developer can't access 'git://' URLs but
can access 'https://' URLs. So supporting tunnelling via a tsocks like
program looks like a more generalized solution to me.
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-10-23 8:42 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-20 14:10 [Qemu-devel] [PATCH] build: allow setting a custom GIT binary for transparent proxying Daniel P. Berrange
2017-10-20 20:06 ` Eric Blake
2017-10-23 8:42 ` Daniel P. Berrange
2017-10-20 22:31 ` Philippe Mathieu-Daudé
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.