* [PATCH] autoconf: add ovmf, rombios and seabios and configure options
@ 2012-04-16 13:36 Roger Pau Monne
2012-04-16 13:58 ` Ian Campbell
0 siblings, 1 reply; 6+ messages in thread
From: Roger Pau Monne @ 2012-04-16 13:36 UTC (permalink / raw)
To: xen-devel; +Cc: Roger Pau Monne
Move this hardcoded options from Config.mk to config/Tools.mk and add the
appropiate configure options.
Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
---
Config.mk | 4 ----
config/Tools.mk.in | 3 +++
tools/configure.ac | 3 +++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/Config.mk b/Config.mk
index 796fb8c..09ac1f9 100644
--- a/Config.mk
+++ b/Config.mk
@@ -207,10 +207,6 @@ SEABIOS_UPSTREAM_TAG ?= rel-1.6.3.2
ETHERBOOT_NICS ?= rtl8139 8086100e
-CONFIG_OVMF ?= n
-CONFIG_ROMBIOS ?= y
-CONFIG_SEABIOS ?= y
-
# Specify which qemu-dm to use. This may be `ioemu' to use the old
# Mercurial in-tree version, or a local directory, or a git URL.
# CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
diff --git a/config/Tools.mk.in b/config/Tools.mk.in
index 339a7b6..5d9276a 100644
--- a/config/Tools.mk.in
+++ b/config/Tools.mk.in
@@ -40,6 +40,9 @@ PYTHON_TOOLS := @pythontools@
OCAML_TOOLS := @ocamltools@
CONFIG_MINITERM := @miniterm@
CONFIG_LOMOUNT := @lomount@
+CONFIG_OVMF := @ovmf@
+CONFIG_ROMBIOS := @rombios@
+CONFIG_SEABIOS := @seabios@
#System options
CONFIG_SYSTEM_LIBAIO:= @system_aio@
diff --git a/tools/configure.ac b/tools/configure.ac
index 0204e36..52571e8 100644
--- a/tools/configure.ac
+++ b/tools/configure.ac
@@ -43,6 +43,9 @@ AX_ARG_DEFAULT_ENABLE([pythontools], [Disable Python tools])
AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools])
AX_ARG_DEFAULT_DISABLE([miniterm], [Enable miniterm])
AX_ARG_DEFAULT_DISABLE([lomount], [Enable lomount])
+AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF])
+AX_ARG_DEFAULT_ENABLE([rombios], [Disable ROM BIOS])
+AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS])
AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools])
AC_ARG_VAR([PREPEND_INCLUDES],
--
1.7.7.5 (Apple Git-26)
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] autoconf: add ovmf, rombios and seabios and configure options
2012-04-16 13:36 [PATCH] autoconf: add ovmf, rombios and seabios and configure options Roger Pau Monne
@ 2012-04-16 13:58 ` Ian Campbell
2012-04-24 16:30 ` Ian Jackson
0 siblings, 1 reply; 6+ messages in thread
From: Ian Campbell @ 2012-04-16 13:58 UTC (permalink / raw)
To: Roger Pau Monne; +Cc: xen-devel
On Mon, 2012-04-16 at 14:36 +0100, Roger Pau Monne wrote:
> Move this hardcoded options from Config.mk to config/Tools.mk and add the
> appropiate configure options.
>
> Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
> ---
> Config.mk | 4 ----
> config/Tools.mk.in | 3 +++
> tools/configure.ac | 3 +++
> 3 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/Config.mk b/Config.mk
> index 796fb8c..09ac1f9 100644
> --- a/Config.mk
> +++ b/Config.mk
> @@ -207,10 +207,6 @@ SEABIOS_UPSTREAM_TAG ?= rel-1.6.3.2
>
> ETHERBOOT_NICS ?= rtl8139 8086100e
>
> -CONFIG_OVMF ?= n
> -CONFIG_ROMBIOS ?= y
> -CONFIG_SEABIOS ?= y
> -
> # Specify which qemu-dm to use. This may be `ioemu' to use the old
> # Mercurial in-tree version, or a local directory, or a git URL.
> # CONFIG_QEMU ?= `pwd`/$(XEN_ROOT)/../qemu-xen.git
> diff --git a/config/Tools.mk.in b/config/Tools.mk.in
> index 339a7b6..5d9276a 100644
> --- a/config/Tools.mk.in
> +++ b/config/Tools.mk.in
> @@ -40,6 +40,9 @@ PYTHON_TOOLS := @pythontools@
> OCAML_TOOLS := @ocamltools@
> CONFIG_MINITERM := @miniterm@
> CONFIG_LOMOUNT := @lomount@
> +CONFIG_OVMF := @ovmf@
> +CONFIG_ROMBIOS := @rombios@
> +CONFIG_SEABIOS := @seabios@
>
> #System options
> CONFIG_SYSTEM_LIBAIO:= @system_aio@
> diff --git a/tools/configure.ac b/tools/configure.ac
> index 0204e36..52571e8 100644
> --- a/tools/configure.ac
> +++ b/tools/configure.ac
> @@ -43,6 +43,9 @@ AX_ARG_DEFAULT_ENABLE([pythontools], [Disable Python tools])
> AX_ARG_DEFAULT_ENABLE([ocamltools], [Disable Ocaml tools])
> AX_ARG_DEFAULT_DISABLE([miniterm], [Enable miniterm])
> AX_ARG_DEFAULT_DISABLE([lomount], [Enable lomount])
> +AX_ARG_DEFAULT_DISABLE([ovmf], [Enable OVMF])
> +AX_ARG_DEFAULT_ENABLE([rombios], [Disable ROM BIOS])
> +AX_ARG_DEFAULT_ENABLE([seabios], [Disable SeaBIOS])
> AX_ARG_DEFAULT_ENABLE([debug], [Disable debug build of tools])
>
> AC_ARG_VAR([PREPEND_INCLUDES],
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] autoconf: add ovmf, rombios and seabios and configure options
2012-04-16 13:58 ` Ian Campbell
@ 2012-04-24 16:30 ` Ian Jackson
2012-04-24 16:48 ` Ian Jackson
0 siblings, 1 reply; 6+ messages in thread
From: Ian Jackson @ 2012-04-24 16:30 UTC (permalink / raw)
To: Ian Campbell; +Cc: xen-devel, Roger Pau Monne
Ian Campbell writes ("Re: [Xen-devel] [PATCH] autoconf: add ovmf, rombios and seabios and configure options"):
> On Mon, 2012-04-16 at 14:36 +0100, Roger Pau Monne wrote:
> > Move this hardcoded options from Config.mk to config/Tools.mk and add the
> > appropiate configure options.
> >
> > Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
>
> Acked-by: Ian Campbell <ian.campbell@citrix.com>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] autoconf: add ovmf, rombios and seabios and configure options
2012-04-24 16:30 ` Ian Jackson
@ 2012-04-24 16:48 ` Ian Jackson
2012-04-24 16:50 ` Roger Pau Monne
0 siblings, 1 reply; 6+ messages in thread
From: Ian Jackson @ 2012-04-24 16:48 UTC (permalink / raw)
To: Ian Campbell, Roger Pau Monne, xen-devel
Ian Jackson writes ("Re: [Xen-devel] [PATCH] autoconf: add ovmf, rombios and seabios and configure options"):
> Ian Campbell writes ("Re: [Xen-devel] [PATCH] autoconf: add ovmf, rombios and seabios and configure options"):
> > On Mon, 2012-04-16 at 14:36 +0100, Roger Pau Monne wrote:
> > > Move this hardcoded options from Config.mk to config/Tools.mk and add the
> > > appropiate configure options.
> > >
> > > Signed-off-by: Roger Pau Monne <roger.pau@citrix.com>
> >
> > Acked-by: Ian Campbell <ian.campbell@citrix.com>
>
> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
Oh, I forgot to mention: you didn't say in your commit message that I
should run ./autogen.sh. But I did anyway.
Ian.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] autoconf: add ovmf, rombios and seabios and configure options
2012-04-24 16:48 ` Ian Jackson
@ 2012-04-24 16:50 ` Roger Pau Monne
2012-04-24 16:53 ` Ian Jackson
0 siblings, 1 reply; 6+ messages in thread
From: Roger Pau Monne @ 2012-04-24 16:50 UTC (permalink / raw)
To: Ian Jackson; +Cc: Ian Campbell, xen-devel
Ian Jackson escribió:
> Ian Jackson writes ("Re: [Xen-devel] [PATCH] autoconf: add ovmf, rombios and seabios and configure options"):
>> Ian Campbell writes ("Re: [Xen-devel] [PATCH] autoconf: add ovmf, rombios and seabios and configure options"):
>>> On Mon, 2012-04-16 at 14:36 +0100, Roger Pau Monne wrote:
>>>> Move this hardcoded options from Config.mk to config/Tools.mk and add the
>>>> appropiate configure options.
>>>>
>>>> Signed-off-by: Roger Pau Monne<roger.pau@citrix.com>
>>> Acked-by: Ian Campbell<ian.campbell@citrix.com>
>> Committed-by: Ian Jackson<ian.jackson@eu.citrix.com>
>
> Oh, I forgot to mention: you didn't say in your commit message that I
> should run ./autogen.sh. But I did anyway.
>
> Ian.
Thanks and sorry for that. I'm not going to add autoconf output to my
patches, since it tends to make them harder to apply, specially if you
apply some other change in between.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] autoconf: add ovmf, rombios and seabios and configure options
2012-04-24 16:50 ` Roger Pau Monne
@ 2012-04-24 16:53 ` Ian Jackson
0 siblings, 0 replies; 6+ messages in thread
From: Ian Jackson @ 2012-04-24 16:53 UTC (permalink / raw)
To: Roger Pau Monne; +Cc: Ian Campbell, xen-devel
Roger Pau Monne writes ("Re: [Xen-devel] [PATCH] autoconf: add ovmf, rombios and seabios and configure options"):
> Thanks and sorry for that. I'm not going to add autoconf output to my
> patches, since it tends to make them harder to apply, specially if you
> apply some other change in between.
That's fine. I don't mind whether you include the autoconf output in
the patch.
Ian.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-04-24 16:53 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-04-16 13:36 [PATCH] autoconf: add ovmf, rombios and seabios and configure options Roger Pau Monne
2012-04-16 13:58 ` Ian Campbell
2012-04-24 16:30 ` Ian Jackson
2012-04-24 16:48 ` Ian Jackson
2012-04-24 16:50 ` Roger Pau Monne
2012-04-24 16:53 ` Ian Jackson
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.