* [PATCH] docs: set CONFDIR when running sphinx
@ 2020-12-01 18:37 marcandre.lureau
2020-12-02 9:05 ` Paolo Bonzini
0 siblings, 1 reply; 5+ messages in thread
From: marcandre.lureau @ 2020-12-01 18:37 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, Marc-André Lureau
From: Marc-André Lureau <marcandre.lureau@redhat.com>
The default configuration path /etc/qemu can be overriden with configure
options, and the generated documentation used to reflect it.
Fixes regression introduced in commit
f8aa24ea9a82da38370470c6bc0eaa393999edfe ("meson: sphinx-build").
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1902537
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
docs/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/docs/meson.build b/docs/meson.build
index ebd85d59f9..bb8fe4c9e4 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -9,7 +9,7 @@ endif
# Check if tools are available to build documentation.
build_docs = false
if sphinx_build.found()
- SPHINX_ARGS = [sphinx_build]
+ SPHINX_ARGS = ['env', 'CONFDIR=' + qemu_confdir, sphinx_build]
# If we're making warnings fatal, apply this to Sphinx runs as well
if get_option('werror')
SPHINX_ARGS += [ '-W' ]
--
2.29.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] docs: set CONFDIR when running sphinx
2020-12-01 18:37 [PATCH] docs: set CONFDIR when running sphinx marcandre.lureau
@ 2020-12-02 9:05 ` Paolo Bonzini
2020-12-02 19:55 ` Eduardo Habkost
0 siblings, 1 reply; 5+ messages in thread
From: Paolo Bonzini @ 2020-12-02 9:05 UTC (permalink / raw)
To: marcandre.lureau, qemu-devel, Eduardo Habkost
On 01/12/20 19:37, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> The default configuration path /etc/qemu can be overriden with configure
> options, and the generated documentation used to reflect it.
>
> Fixes regression introduced in commit
> f8aa24ea9a82da38370470c6bc0eaa393999edfe ("meson: sphinx-build").
>
> Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1902537
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> docs/meson.build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/docs/meson.build b/docs/meson.build
> index ebd85d59f9..bb8fe4c9e4 100644
> --- a/docs/meson.build
> +++ b/docs/meson.build
> @@ -9,7 +9,7 @@ endif
> # Check if tools are available to build documentation.
> build_docs = false
> if sphinx_build.found()
> - SPHINX_ARGS = [sphinx_build]
> + SPHINX_ARGS = ['env', 'CONFDIR=' + qemu_confdir, sphinx_build]
> # If we're making warnings fatal, apply this to Sphinx runs as well
> if get_option('werror')
> SPHINX_ARGS += [ '-W' ]
>
I can queue the patch, but I also wouldn't mind removing support for
/etc/qemu completely. I'm not sure why one would use it. Eduardo?
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] docs: set CONFDIR when running sphinx
2020-12-02 9:05 ` Paolo Bonzini
@ 2020-12-02 19:55 ` Eduardo Habkost
2020-12-03 10:28 ` Marc-André Lureau
0 siblings, 1 reply; 5+ messages in thread
From: Eduardo Habkost @ 2020-12-02 19:55 UTC (permalink / raw)
To: Paolo Bonzini; +Cc: marcandre.lureau, qemu-devel
On Wed, Dec 02, 2020 at 10:05:50AM +0100, Paolo Bonzini wrote:
> On 01/12/20 19:37, marcandre.lureau@redhat.com wrote:
> > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> >
> > The default configuration path /etc/qemu can be overriden with configure
> > options, and the generated documentation used to reflect it.
> >
> > Fixes regression introduced in commit
> > f8aa24ea9a82da38370470c6bc0eaa393999edfe ("meson: sphinx-build").
> >
> > Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1902537
> > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > ---
> > docs/meson.build | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/docs/meson.build b/docs/meson.build
> > index ebd85d59f9..bb8fe4c9e4 100644
> > --- a/docs/meson.build
> > +++ b/docs/meson.build
> > @@ -9,7 +9,7 @@ endif
> > # Check if tools are available to build documentation.
> > build_docs = false
> > if sphinx_build.found()
> > - SPHINX_ARGS = [sphinx_build]
> > + SPHINX_ARGS = ['env', 'CONFDIR=' + qemu_confdir, sphinx_build]
> > # If we're making warnings fatal, apply this to Sphinx runs as well
> > if get_option('werror')
> > SPHINX_ARGS += [ '-W' ]
> >
>
> I can queue the patch, but I also wouldn't mind removing support for
> /etc/qemu completely. I'm not sure why one would use it. Eduardo?
I agree, and I had a series for this 3 years ago.
I guess I need to my keep my word and finally submit v5 of the series:
https://lore.kernel.org/qemu-devel/20171005123414.GE4015@localhost.localdomain/
--
Eduardo
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] docs: set CONFDIR when running sphinx
2020-12-02 19:55 ` Eduardo Habkost
@ 2020-12-03 10:28 ` Marc-André Lureau
2020-12-03 11:38 ` Paolo Bonzini
0 siblings, 1 reply; 5+ messages in thread
From: Marc-André Lureau @ 2020-12-03 10:28 UTC (permalink / raw)
To: Eduardo Habkost; +Cc: Paolo Bonzini, QEMU
[-- Attachment #1: Type: text/plain, Size: 1925 bytes --]
Hi
On Wed, Dec 2, 2020 at 11:55 PM Eduardo Habkost <ehabkost@redhat.com> wrote:
> On Wed, Dec 02, 2020 at 10:05:50AM +0100, Paolo Bonzini wrote:
> > On 01/12/20 19:37, marcandre.lureau@redhat.com wrote:
> > > From: Marc-André Lureau <marcandre.lureau@redhat.com>
> > >
> > > The default configuration path /etc/qemu can be overriden with
> configure
> > > options, and the generated documentation used to reflect it.
> > >
> > > Fixes regression introduced in commit
> > > f8aa24ea9a82da38370470c6bc0eaa393999edfe ("meson: sphinx-build").
> > >
> > > Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1902537
> > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> > > ---
> > > docs/meson.build | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/docs/meson.build b/docs/meson.build
> > > index ebd85d59f9..bb8fe4c9e4 100644
> > > --- a/docs/meson.build
> > > +++ b/docs/meson.build
> > > @@ -9,7 +9,7 @@ endif
> > > # Check if tools are available to build documentation.
> > > build_docs = false
> > > if sphinx_build.found()
> > > - SPHINX_ARGS = [sphinx_build]
> > > + SPHINX_ARGS = ['env', 'CONFDIR=' + qemu_confdir, sphinx_build]
> > > # If we're making warnings fatal, apply this to Sphinx runs as well
> > > if get_option('werror')
> > > SPHINX_ARGS += [ '-W' ]
> > >
> >
> > I can queue the patch, but I also wouldn't mind removing support for
> > /etc/qemu completely. I'm not sure why one would use it. Eduardo?
>
> I agree, and I had a series for this 3 years ago.
>
> I guess I need to my keep my word and finally submit v5 of the series:
>
> https://lore.kernel.org/qemu-devel/20171005123414.GE4015@localhost.localdomain/
>
Note that the original bug that prompted this fix is about qemu-ga
configuration though.
Paolo, please queue the patch. thanks!
--
Marc-André Lureau
[-- Attachment #2: Type: text/html, Size: 3099 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-12-03 11:41 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-12-01 18:37 [PATCH] docs: set CONFDIR when running sphinx marcandre.lureau
2020-12-02 9:05 ` Paolo Bonzini
2020-12-02 19:55 ` Eduardo Habkost
2020-12-03 10:28 ` Marc-André Lureau
2020-12-03 11:38 ` Paolo Bonzini
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).