* [PATCH] Honor '--enable-githttp' in toplevel Makefile generation
@ 2016-05-04 15:54 Paul Lai
2016-05-05 9:31 ` Wei Liu
0 siblings, 1 reply; 3+ messages in thread
From: Paul Lai @ 2016-05-04 15:54 UTC (permalink / raw)
To: xen-devel; +Cc: paul.c.lai, wei.liu2
During the make world, git mini-os.git didn't honor the 'configure
--enable-githttp' option. The 'enable-githttp' was only honored in
the tools subdirectory.
Signed-off-by: Paul Lai <paul.c.lai@intel.com>
---
config/Toplevel.mk.in | 1 +
configure | 27 +++++++++++++++++++++++++++
configure.ac | 1 +
3 files changed, 29 insertions(+)
diff --git a/config/Toplevel.mk.in b/config/Toplevel.mk.in
index 4db7eaf..1d99189 100644
--- a/config/Toplevel.mk.in
+++ b/config/Toplevel.mk.in
@@ -1 +1,2 @@
SUBSYSTEMS := @SUBSYSTEMS@
+GIT_HTTP := @githttp@
diff --git a/configure b/configure
index c200eed..8b07126 100755
--- a/configure
+++ b/configure
@@ -594,6 +594,7 @@ stubdom
tools
xen
subdirs
+githttp
XEN_DUMP_DIR
XEN_PAGING_DIR
XEN_LOCK_DIR
@@ -664,6 +665,7 @@ with_initddir
with_sysconfig_leaf_dir
with_libexec_leaf_dir
with_xen_dumpdir
+enable_githttp
enable_xen
enable_tools
enable_stubdom
@@ -1288,6 +1290,8 @@ 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-githttp Download GIT repositories via HTTP (default is
+ DISABLED)
--disable-xen Disable build and install of xen
--disable-tools Disable build and install of tools
--enable-stubdom Enable build and install of stubdom
@@ -2005,6 +2009,29 @@ XEN_DUMP_DIR=$xen_dumpdir_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 1843b52..7388b28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,6 +17,7 @@ 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
--
1.9.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] Honor '--enable-githttp' in toplevel Makefile generation
2016-05-04 15:54 [PATCH] Honor '--enable-githttp' in toplevel Makefile generation Paul Lai
@ 2016-05-05 9:31 ` Wei Liu
2016-05-05 10:37 ` Wei Liu
0 siblings, 1 reply; 3+ messages in thread
From: Wei Liu @ 2016-05-05 9:31 UTC (permalink / raw)
To: Paul Lai; +Cc: xen-devel, wei.liu2
On Wed, May 04, 2016 at 08:54:07AM -0700, Paul Lai wrote:
> During the make world, git mini-os.git didn't honor the 'configure
> --enable-githttp' option. The 'enable-githttp' was only honored in
> the tools subdirectory.
>
> Signed-off-by: Paul Lai <paul.c.lai@intel.com>
Acked-by: Wei Liu <wei.liu2@citrix.com>
Thanks for your patch.
I will queue this up for pushing shortly. And FYI I will re-generate the
changes to configure as I commit this.
Wei.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] Honor '--enable-githttp' in toplevel Makefile generation
2016-05-05 9:31 ` Wei Liu
@ 2016-05-05 10:37 ` Wei Liu
0 siblings, 0 replies; 3+ messages in thread
From: Wei Liu @ 2016-05-05 10:37 UTC (permalink / raw)
To: Paul Lai; +Cc: xen-devel, wei.liu2
On Thu, May 05, 2016 at 10:31:04AM +0100, Wei Liu wrote:
> On Wed, May 04, 2016 at 08:54:07AM -0700, Paul Lai wrote:
> > During the make world, git mini-os.git didn't honor the 'configure
> > --enable-githttp' option. The 'enable-githttp' was only honored in
> > the tools subdirectory.
> >
> > Signed-off-by: Paul Lai <paul.c.lai@intel.com>
>
> Acked-by: Wei Liu <wei.liu2@citrix.com>
>
> Thanks for your patch.
>
> I will queue this up for pushing shortly. And FYI I will re-generate the
> changes to configure as I commit this.
>
And it is now pushed to staging branch. I added "build: " prefix to the
subject line.
Wei.
> Wei.
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-05-05 10:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-04 15:54 [PATCH] Honor '--enable-githttp' in toplevel Makefile generation Paul Lai
2016-05-05 9:31 ` Wei Liu
2016-05-05 10:37 ` Wei Liu
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).