* [Qemu-devel] [PATCH] doc: fix the configuration path
@ 2018-11-26 10:51 Marc-André Lureau
2019-02-07 13:55 ` Marc-André Lureau
2019-02-07 16:31 ` Philippe Mathieu-Daudé
0 siblings, 2 replies; 4+ messages in thread
From: Marc-André Lureau @ 2018-11-26 10:51 UTC (permalink / raw)
To: qemu-devel; +Cc: Marc-André Lureau, Michael Roth
Use a CONFDIR variable to show the configured sysconf path in the
generated documentations (html, man pages etc).
Related to:
https://bugzilla.redhat.com/show_bug.cgi?id=1644985
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
Makefile | 9 ++++++---
qemu-ga.texi | 4 ++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 9cc4dae1a6..a39c231d1c 100644
--- a/Makefile
+++ b/Makefile
@@ -932,11 +932,14 @@ ui/shader.o: $(SRC_PATH)/ui/shader.c \
MAKEINFO=makeinfo
MAKEINFOINCLUDES= -I docs -I $(<D) -I $(@D)
MAKEINFOFLAGS=--no-split --number-sections $(MAKEINFOINCLUDES)
-TEXI2PODFLAGS=$(MAKEINFOINCLUDES) "-DVERSION=$(VERSION)"
+TEXI2PODFLAGS=$(MAKEINFOINCLUDES) -DVERSION="$(VERSION)" -DCONFDIR="$(qemu_confdir)"
TEXI2PDFFLAGS=$(if $(V),,--quiet) -I $(SRC_PATH) $(MAKEINFOINCLUDES)
-docs/version.texi: $(SRC_PATH)/VERSION
- $(call quiet-command,echo "@set VERSION $(VERSION)" > $@,"GEN","$@")
+docs/version.texi: $(SRC_PATH)/VERSION config-host.mak
+ $(call quiet-command,(\
+ echo "@set VERSION $(VERSION)" && \
+ echo "@set CONFDIR $(qemu_confdir)" \
+ )> $@,"GEN","$@")
%.html: %.texi docs/version.texi
$(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \
diff --git a/qemu-ga.texi b/qemu-ga.texi
index 4c7a8fd163..f00ad830f2 100644
--- a/qemu-ga.texi
+++ b/qemu-ga.texi
@@ -30,7 +30,7 @@ set user's password
@end itemize
qemu-ga will read a system configuration file on startup (located at
-@file{/etc/qemu/qemu-ga.conf} by default), then parse remaining
+@file{@value{CONFDIR}/qemu-ga.conf} by default), then parse remaining
configuration options on the command line. For the same key, the last
option wins, but the lists accumulate (see below for configuration
file format).
@@ -58,7 +58,7 @@ file format).
Enable fsfreeze hook. Accepts an optional argument that specifies
script to run on freeze/thaw. Script will be called with
'freeze'/'thaw' arguments accordingly (default is
- @samp{/etc/qemu/fsfreeze-hook}). If using -F with an argument, do
+ @samp{@value{CONFDIR}/fsfreeze-hook}). If using -F with an argument, do
not follow -F with a space (for example:
@samp{-F/var/run/fsfreezehook.sh}).
--
2.20.0.rc1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] doc: fix the configuration path
2018-11-26 10:51 [Qemu-devel] [PATCH] doc: fix the configuration path Marc-André Lureau
@ 2019-02-07 13:55 ` Marc-André Lureau
2019-02-07 16:31 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 4+ messages in thread
From: Marc-André Lureau @ 2019-02-07 13:55 UTC (permalink / raw)
To: qemu-devel; +Cc: Michael Roth
On Mon, Nov 26, 2018 at 11:51 AM Marc-André Lureau
<marcandre.lureau@redhat.com> wrote:
>
> Use a CONFDIR variable to show the configured sysconf path in the
> generated documentations (html, man pages etc).
>
> Related to:
> https://bugzilla.redhat.com/show_bug.cgi?id=1644985
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
ping
> ---
> Makefile | 9 ++++++---
> qemu-ga.texi | 4 ++--
> 2 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 9cc4dae1a6..a39c231d1c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -932,11 +932,14 @@ ui/shader.o: $(SRC_PATH)/ui/shader.c \
> MAKEINFO=makeinfo
> MAKEINFOINCLUDES= -I docs -I $(<D) -I $(@D)
> MAKEINFOFLAGS=--no-split --number-sections $(MAKEINFOINCLUDES)
> -TEXI2PODFLAGS=$(MAKEINFOINCLUDES) "-DVERSION=$(VERSION)"
> +TEXI2PODFLAGS=$(MAKEINFOINCLUDES) -DVERSION="$(VERSION)" -DCONFDIR="$(qemu_confdir)"
> TEXI2PDFFLAGS=$(if $(V),,--quiet) -I $(SRC_PATH) $(MAKEINFOINCLUDES)
>
> -docs/version.texi: $(SRC_PATH)/VERSION
> - $(call quiet-command,echo "@set VERSION $(VERSION)" > $@,"GEN","$@")
> +docs/version.texi: $(SRC_PATH)/VERSION config-host.mak
> + $(call quiet-command,(\
> + echo "@set VERSION $(VERSION)" && \
> + echo "@set CONFDIR $(qemu_confdir)" \
> + )> $@,"GEN","$@")
>
> %.html: %.texi docs/version.texi
> $(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \
> diff --git a/qemu-ga.texi b/qemu-ga.texi
> index 4c7a8fd163..f00ad830f2 100644
> --- a/qemu-ga.texi
> +++ b/qemu-ga.texi
> @@ -30,7 +30,7 @@ set user's password
> @end itemize
>
> qemu-ga will read a system configuration file on startup (located at
> -@file{/etc/qemu/qemu-ga.conf} by default), then parse remaining
> +@file{@value{CONFDIR}/qemu-ga.conf} by default), then parse remaining
> configuration options on the command line. For the same key, the last
> option wins, but the lists accumulate (see below for configuration
> file format).
> @@ -58,7 +58,7 @@ file format).
> Enable fsfreeze hook. Accepts an optional argument that specifies
> script to run on freeze/thaw. Script will be called with
> 'freeze'/'thaw' arguments accordingly (default is
> - @samp{/etc/qemu/fsfreeze-hook}). If using -F with an argument, do
> + @samp{@value{CONFDIR}/fsfreeze-hook}). If using -F with an argument, do
> not follow -F with a space (for example:
> @samp{-F/var/run/fsfreezehook.sh}).
>
> --
> 2.20.0.rc1
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] doc: fix the configuration path
2018-11-26 10:51 [Qemu-devel] [PATCH] doc: fix the configuration path Marc-André Lureau
2019-02-07 13:55 ` Marc-André Lureau
@ 2019-02-07 16:31 ` Philippe Mathieu-Daudé
[not found] ` <1d019621-50b2-1118-a477-e7fffc8147ff@redhat.com>
1 sibling, 1 reply; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-02-07 16:31 UTC (permalink / raw)
To: Marc-André Lureau, qemu-devel; +Cc: Michael Roth
On 11/26/18 11:51 AM, Marc-André Lureau wrote:
> Use a CONFDIR variable to show the configured sysconf path in the
> generated documentations (html, man pages etc).
>
> Related to:
> https://bugzilla.redhat.com/show_bug.cgi?id=1644985
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Makefile | 9 ++++++---
> qemu-ga.texi | 4 ++--
> 2 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 9cc4dae1a6..a39c231d1c 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -932,11 +932,14 @@ ui/shader.o: $(SRC_PATH)/ui/shader.c \
> MAKEINFO=makeinfo
> MAKEINFOINCLUDES= -I docs -I $(<D) -I $(@D)
> MAKEINFOFLAGS=--no-split --number-sections $(MAKEINFOINCLUDES)
> -TEXI2PODFLAGS=$(MAKEINFOINCLUDES) "-DVERSION=$(VERSION)"
> +TEXI2PODFLAGS=$(MAKEINFOINCLUDES) -DVERSION="$(VERSION)" -DCONFDIR="$(qemu_confdir)"
> TEXI2PDFFLAGS=$(if $(V),,--quiet) -I $(SRC_PATH) $(MAKEINFOINCLUDES)
>
> -docs/version.texi: $(SRC_PATH)/VERSION
> - $(call quiet-command,echo "@set VERSION $(VERSION)" > $@,"GEN","$@")
> +docs/version.texi: $(SRC_PATH)/VERSION config-host.mak
> + $(call quiet-command,(\
> + echo "@set VERSION $(VERSION)" && \
> + echo "@set CONFDIR $(qemu_confdir)" \
> + )> $@,"GEN","$@")
>
> %.html: %.texi docs/version.texi
> $(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \
> diff --git a/qemu-ga.texi b/qemu-ga.texi
> index 4c7a8fd163..f00ad830f2 100644
> --- a/qemu-ga.texi
> +++ b/qemu-ga.texi
> @@ -30,7 +30,7 @@ set user's password
> @end itemize
>
> qemu-ga will read a system configuration file on startup (located at
> -@file{/etc/qemu/qemu-ga.conf} by default), then parse remaining
> +@file{@value{CONFDIR}/qemu-ga.conf} by default), then parse remaining
> configuration options on the command line. For the same key, the last
> option wins, but the lists accumulate (see below for configuration
> file format).
> @@ -58,7 +58,7 @@ file format).
> Enable fsfreeze hook. Accepts an optional argument that specifies
> script to run on freeze/thaw. Script will be called with
> 'freeze'/'thaw' arguments accordingly (default is
> - @samp{/etc/qemu/fsfreeze-hook}). If using -F with an argument, do
> + @samp{@value{CONFDIR}/fsfreeze-hook}). If using -F with an argument, do
> not follow -F with a space (for example:
> @samp{-F/var/run/fsfreezehook.sh}).
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [Qemu-trivial] [PATCH] doc: fix the configuration path
[not found] ` <1d019621-50b2-1118-a477-e7fffc8147ff@redhat.com>
@ 2019-04-11 19:59 ` Laurent Vivier
0 siblings, 0 replies; 4+ messages in thread
From: Laurent Vivier @ 2019-04-11 19:59 UTC (permalink / raw)
To: Thomas Huth, Philippe Mathieu-Daudé,
Marc-André Lureau, qemu-devel
Cc: QEMU Trivial
On 30/03/2019 17:30, Thomas Huth wrote:
> On 07/02/2019 17.31, Philippe Mathieu-Daudé wrote:
>> On 11/26/18 11:51 AM, Marc-André Lureau wrote:
>>> Use a CONFDIR variable to show the configured sysconf path in the
>>> generated documentations (html, man pages etc).
>>>
>>> Related to:
>>> https://bugzilla.redhat.com/show_bug.cgi?id=1644985
>>>
>>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
>>
>> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
>>
>>> ---
>>> Makefile | 9 ++++++---
>>> qemu-ga.texi | 4 ++--
>>> 2 files changed, 8 insertions(+), 5 deletions(-)
>>>
>>> diff --git a/Makefile b/Makefile
>>> index 9cc4dae1a6..a39c231d1c 100644
>>> --- a/Makefile
>>> +++ b/Makefile
>>> @@ -932,11 +932,14 @@ ui/shader.o: $(SRC_PATH)/ui/shader.c \
>>> MAKEINFO=makeinfo
>>> MAKEINFOINCLUDES= -I docs -I $(<D) -I $(@D)
>>> MAKEINFOFLAGS=--no-split --number-sections $(MAKEINFOINCLUDES)
>>> -TEXI2PODFLAGS=$(MAKEINFOINCLUDES) "-DVERSION=$(VERSION)"
>>> +TEXI2PODFLAGS=$(MAKEINFOINCLUDES) -DVERSION="$(VERSION)" -DCONFDIR="$(qemu_confdir)"
>>> TEXI2PDFFLAGS=$(if $(V),,--quiet) -I $(SRC_PATH) $(MAKEINFOINCLUDES)
>>>
>>> -docs/version.texi: $(SRC_PATH)/VERSION
>>> - $(call quiet-command,echo "@set VERSION $(VERSION)" > $@,"GEN","$@")
>>> +docs/version.texi: $(SRC_PATH)/VERSION config-host.mak
>>> + $(call quiet-command,(\
>>> + echo "@set VERSION $(VERSION)" && \
>>> + echo "@set CONFDIR $(qemu_confdir)" \
>>> + )> $@,"GEN","$@")
>>>
>>> %.html: %.texi docs/version.texi
>>> $(call quiet-command,LC_ALL=C $(MAKEINFO) $(MAKEINFOFLAGS) --no-headers \
>>> diff --git a/qemu-ga.texi b/qemu-ga.texi
>>> index 4c7a8fd163..f00ad830f2 100644
>>> --- a/qemu-ga.texi
>>> +++ b/qemu-ga.texi
>>> @@ -30,7 +30,7 @@ set user's password
>>> @end itemize
>>>
>>> qemu-ga will read a system configuration file on startup (located at
>>> -@file{/etc/qemu/qemu-ga.conf} by default), then parse remaining
>>> +@file{@value{CONFDIR}/qemu-ga.conf} by default), then parse remaining
>>> configuration options on the command line. For the same key, the last
>>> option wins, but the lists accumulate (see below for configuration
>>> file format).
>>> @@ -58,7 +58,7 @@ file format).
>>> Enable fsfreeze hook. Accepts an optional argument that specifies
>>> script to run on freeze/thaw. Script will be called with
>>> 'freeze'/'thaw' arguments accordingly (default is
>>> - @samp{/etc/qemu/fsfreeze-hook}). If using -F with an argument, do
>>> + @samp{@value{CONFDIR}/fsfreeze-hook}). If using -F with an argument, do
>>> not follow -F with a space (for example:
>>> @samp{-F/var/run/fsfreezehook.sh}).
>
> Ping^2
>
> I think this could also go via qemu-trivial...?
>
> Thomas
>
Applied to my trivial-patches branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-04-11 19:59 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-26 10:51 [Qemu-devel] [PATCH] doc: fix the configuration path Marc-André Lureau
2019-02-07 13:55 ` Marc-André Lureau
2019-02-07 16:31 ` Philippe Mathieu-Daudé
[not found] ` <1d019621-50b2-1118-a477-e7fffc8147ff@redhat.com>
2019-04-11 19:59 ` [Qemu-devel] [Qemu-trivial] " Laurent Vivier
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.