qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: marcandre.lureau@redhat.com, qemu-devel@nongnu.org,
	Eduardo Habkost <ehabkost@redhat.com>
Subject: Re: [PATCH] docs: set CONFDIR when running sphinx
Date: Wed, 2 Dec 2020 10:05:50 +0100	[thread overview]
Message-ID: <cca70efa-d001-f4d5-f019-5ec55b7a4349@redhat.com> (raw)
In-Reply-To: <20201201183704.299697-1-marcandre.lureau@redhat.com>

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?



  reply	other threads:[~2020-12-02 10:13 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-01 18:37 [PATCH] docs: set CONFDIR when running sphinx marcandre.lureau
2020-12-02  9:05 ` Paolo Bonzini [this message]
2020-12-02 19:55   ` Eduardo Habkost
2020-12-03 10:28     ` Marc-André Lureau
2020-12-03 11:38       ` Paolo Bonzini

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cca70efa-d001-f4d5-f019-5ec55b7a4349@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=ehabkost@redhat.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).