On Fri, Mar 24, 2023 at 08:14:04PM +, Andrew Cooper wrote:
> Following Demi's work to use HTTPS everywhere, all users of GIT_HTTP have
> been removed from the build system. Drop the configure knob.
>
> Signed-off-by: Andrew Cooper
Reviewed-by: Demi Marie Obenour
> ---
> CC: Anthony PERARD
> CC: Demi Marie Obenour
> CC: George Dunlap
> CC: Jan Beulich
> CC: Stefano Stabellini
> CC: Wei Liu
> CC: Julien Grall
> ---
> INSTALL | 5 -
> config/Tools.mk.in| 6 --
> config/Toplevel.mk.in | 1 -
> configure | 27 ---
> configure.ac | 1 -
> tools/configure | 27 ---
> tools/configure.ac| 1 -
> 7 files changed, 68 deletions(-)
>
> diff --git a/INSTALL b/INSTALL
> index 0d3eb89f0298..3816c17dcde8 100644
> --- a/INSTALL
> +++ b/INSTALL
> @@ -89,11 +89,6 @@ from a wrong location. Compiling the tools with rpath will
> force the
> linker to look in the correct location.
>--enable-rpath
>
> -During build in a git checkout the buildsystem needs to download
> -additional tools such as qemu. This is done with either the native git
> -protocol, or via http if this option is enabled.
> - --enable-githttp
> -
> Disable xenstat and xentop monitoring tools.
>--disable-monitors
>
> diff --git a/config/Tools.mk.in b/config/Tools.mk.in
> index d0d460f922d8..6abb377564db 100644
> --- a/config/Tools.mk.in
> +++ b/config/Tools.mk.in
> @@ -37,12 +37,6 @@ LIBNL3_LIBS := @LIBNL3_LIBS@
> LIBNL3_CFLAGS := @LIBNL3_CFLAGS@
> XEN_TOOLS_RPATH := @rpath@
>
> -# Download GIT repositories via HTTP or GIT's own protocol?
> -# GIT's protocol is faster and more robust, when it works at all (firewalls
> -# may block it). We make it the default, but if your GIT repository downloads
> -# fail or hang, please pass --enable-githttp to configure.
> -GIT_HTTP?= @githttp@
> -
> # Optional components
> XENSTAT_XENTOP := @monitors@
> OCAML_TOOLS := @ocamltools@
> diff --git a/config/Toplevel.mk.in b/config/Toplevel.mk.in
> index 4ecacbb37d68..4db7eafcab5d 100644
> --- a/config/Toplevel.mk.in
> +++ b/config/Toplevel.mk.in
> @@ -1,2 +1 @@
> SUBSYSTEMS := @SUBSYSTEMS@
> -GIT_HTTP ?= @githttp@
> diff --git a/configure b/configure
> index f5cd3c286b55..99f8434cbf64 100755
> --- a/configure
> +++ b/configure
> @@ -594,7 +594,6 @@ stubdom
> tools
> xen
> subdirs
> -githttp
> DEBUG_DIR
> XEN_DUMP_DIR
> XEN_PAGING_DIR
> @@ -673,7 +672,6 @@ with_xen_scriptdir
> with_xen_dumpdir
> with_rundir
> with_debugdir
> -enable_githttp
> enable_xen
> enable_tools
> enable_stubdom
> @@ -1309,8 +1307,6 @@ Optional Features:
>--disable-option-checking ignore unrecognized --enable/--with options
>--disable-FEATURE do not include FEATURE (same as
> --enable-FEATURE=no)
>--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
> - --enable-githttpDownload GIT repositories via HTTP (default is
> - DISABLED)
>--disable-xen Disable build and install of xen
>--disable-tools Disable build and install of tools
>--enable-stubdomEnable build and install of stubdom
> @@ -2124,29 +2120,6 @@ DEBUG_DIR=$debugdir_path
>
>
>
> -# Check whether --enable-githttp was given.
> -if test "${enable_githttp+set}" = set; then :
> - enableval=$enable_githttp;
> -fi
> -
> -
> -if test "x$enable_githttp" = "xno"; then :
> -
> -ax_cv_githttp="n"
> -
> -elif test "x$enable_githttp" = "xyes"; then :
> -
> -ax_cv_githttp="y"
> -
> -elif test -z $ax_cv_githttp; then :
> -
> -ax_cv_githttp="n"
> -
> -fi
> -githttp=$ax_cv_githttp
> -
> -
> -
> case "$host_cpu" in
> i[3456]86|x86_64)
> arch_enable_stubdom=y
> diff --git a/configure.ac b/configure.ac
> index 3aea40715307..19d9311c2ae4 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -17,7 +17,6 @@ m4_include([m4/subsystem.m4])
> m4_include([m4/paths.m4])
>
> AX_XEN_EXPAND_CONFIG()
> -AX_ARG_DEFAULT_DISABLE([githttp], [Download GIT repositories via HTTP])
>
> dnl mini-os is only ported to certain platforms
> case "$host_cpu" in
> diff --git a/tools/configure b/tools/configure
> index dae377c98252..bb5b1ae45067 100755
> --- a/tools/configure
> +++ b/tools/configure
> @@ -714,7 +714,6 @@ ovmf
> xsmpolicy
> ocamltools
> monitors
> -githttp
> rpath
> werror
> DEBUG_DIR
> @@ -807,7 +806,6 @@ with_rundir
> with_debugdir
> enable_werror
> enable_rpath
> -enable_githttp
> enable_monitors
> enable_ocamltools
> enable_xsmpolicy
> @@ -1494,8 +1492,6 @@ Optional Features:
>--disable-werrorBuild tools without -Werror (default is ENABLED)
>--enable-rpath Build tools with -Wl,-rpath,LIBDIR (default is
>DISABLED)
> - --enable-githttpDownload GIT repositories via HTTP (default is
> - DISABLED)
>--disable-monitors