* [PATCH] Makefile: Let the 'help' target list the helper targets
@ 2020-04-23 10:43 Philippe Mathieu-Daudé
2020-05-04 8:53 ` Philippe Mathieu-Daudé
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-04-23 10:43 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Paolo Bonzini, Philippe Mathieu-Daudé
List the name of the helper targets when calling 'make help',
along with the tool targets:
$ make help
[...]
Helper targets:
fsdev/virtfs-proxy-helper - Build virtfs-proxy-helper
scsi/qemu-pr-helper - Build qemu-pr-helper
qemu-bridge-helper - Build qemu-bridge-helper
vhost-user-gpu - Build vhost-user-gpu
virtiofsd - Build virtiofsd
Tools targets:
qemu-ga - Build qemu-ga tool
qemu-keymap - Build qemu-keymap tool
elf2dmp - Build elf2dmp tool
ivshmem-client - Build ivshmem-client tool
ivshmem-server - Build ivshmem-server tool
qemu-nbd - Build qemu-nbd tool
qemu-storage-daemon - Build qemu-storage-daemon tool
qemu-img - Build qemu-img tool
qemu-io - Build qemu-io tool
qemu-edid - Build qemu-edid tool
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
configure | 5 +++--
Makefile | 9 +++++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index 23b5e93752..caf880c38e 100755
--- a/configure
+++ b/configure
@@ -6374,7 +6374,7 @@ if test "$softmmu" = yes ; then
if test "$linux" = yes; then
if test "$virtfs" != no && test "$cap_ng" = yes && test "$attr" = yes ; then
virtfs=yes
- tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
+ helpers="$helpers fsdev/virtfs-proxy-helper\$(EXESUF)"
else
if test "$virtfs" = yes; then
error_exit "VirtFS requires libcap-ng devel and libattr devel"
@@ -6389,7 +6389,7 @@ if test "$softmmu" = yes ; then
fi
mpath=no
fi
- tools="$tools scsi/qemu-pr-helper\$(EXESUF)"
+ helpers="$helpers scsi/qemu-pr-helper\$(EXESUF)"
else
if test "$virtfs" = yes; then
error_exit "VirtFS is supported only on Linux"
@@ -7630,6 +7630,7 @@ else
QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES"
fi
+echo "HELPERS=$helpers" >> $config_host_mak
echo "TOOLS=$tools" >> $config_host_mak
echo "ROMS=$roms" >> $config_host_mak
echo "MAKE=$make" >> $config_host_mak
diff --git a/Makefile b/Makefile
index 8a9113e666..021a0cd491 100644
--- a/Makefile
+++ b/Makefile
@@ -336,9 +336,9 @@ $(call set-vpath, $(SRC_PATH))
LIBS+=-lz $(LIBS_TOOLS)
vhost-user-json-y =
-HELPERS-y =
+HELPERS-y = $(HELPERS)
-HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF)
+HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) += qemu-bridge-helper$(EXESUF)
ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy)
HELPERS-y += vhost-user-gpu$(EXESUF)
@@ -1255,6 +1255,11 @@ endif
$(foreach t, $(TARGET_DIRS), \
$(call print-help-run,$(t)/all,Build for $(t));) \
echo '')
+ @$(if $(HELPERS-y), \
+ echo 'Helper targets:'; \
+ $(foreach t, $(HELPERS-y), \
+ $(call print-help-run,$(t),Build $(shell basename $(t)));) \
+ echo '')
@$(if $(TOOLS), \
echo 'Tools targets:'; \
$(foreach t, $(TOOLS), \
--
2.21.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Makefile: Let the 'help' target list the helper targets
2020-04-23 10:43 [PATCH] Makefile: Let the 'help' target list the helper targets Philippe Mathieu-Daudé
@ 2020-05-04 8:53 ` Philippe Mathieu-Daudé
2020-05-04 13:14 ` Stefan Hajnoczi
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-05-04 8:53 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Paolo Bonzini
Ping?
On 4/23/20 12:43 PM, Philippe Mathieu-Daudé wrote:
> List the name of the helper targets when calling 'make help',
> along with the tool targets:
>
> $ make help
> [...]
>
> Helper targets:
> fsdev/virtfs-proxy-helper - Build virtfs-proxy-helper
> scsi/qemu-pr-helper - Build qemu-pr-helper
> qemu-bridge-helper - Build qemu-bridge-helper
> vhost-user-gpu - Build vhost-user-gpu
> virtiofsd - Build virtiofsd
>
> Tools targets:
> qemu-ga - Build qemu-ga tool
> qemu-keymap - Build qemu-keymap tool
> elf2dmp - Build elf2dmp tool
> ivshmem-client - Build ivshmem-client tool
> ivshmem-server - Build ivshmem-server tool
> qemu-nbd - Build qemu-nbd tool
> qemu-storage-daemon - Build qemu-storage-daemon tool
> qemu-img - Build qemu-img tool
> qemu-io - Build qemu-io tool
> qemu-edid - Build qemu-edid tool
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> configure | 5 +++--
> Makefile | 9 +++++++--
> 2 files changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/configure b/configure
> index 23b5e93752..caf880c38e 100755
> --- a/configure
> +++ b/configure
> @@ -6374,7 +6374,7 @@ if test "$softmmu" = yes ; then
> if test "$linux" = yes; then
> if test "$virtfs" != no && test "$cap_ng" = yes && test "$attr" = yes ; then
> virtfs=yes
> - tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
> + helpers="$helpers fsdev/virtfs-proxy-helper\$(EXESUF)"
> else
> if test "$virtfs" = yes; then
> error_exit "VirtFS requires libcap-ng devel and libattr devel"
> @@ -6389,7 +6389,7 @@ if test "$softmmu" = yes ; then
> fi
> mpath=no
> fi
> - tools="$tools scsi/qemu-pr-helper\$(EXESUF)"
> + helpers="$helpers scsi/qemu-pr-helper\$(EXESUF)"
> else
> if test "$virtfs" = yes; then
> error_exit "VirtFS is supported only on Linux"
> @@ -7630,6 +7630,7 @@ else
> QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES"
> fi
>
> +echo "HELPERS=$helpers" >> $config_host_mak
> echo "TOOLS=$tools" >> $config_host_mak
> echo "ROMS=$roms" >> $config_host_mak
> echo "MAKE=$make" >> $config_host_mak
> diff --git a/Makefile b/Makefile
> index 8a9113e666..021a0cd491 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -336,9 +336,9 @@ $(call set-vpath, $(SRC_PATH))
> LIBS+=-lz $(LIBS_TOOLS)
>
> vhost-user-json-y =
> -HELPERS-y =
> +HELPERS-y = $(HELPERS)
>
> -HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF)
> +HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) += qemu-bridge-helper$(EXESUF)
>
> ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy)
> HELPERS-y += vhost-user-gpu$(EXESUF)
> @@ -1255,6 +1255,11 @@ endif
> $(foreach t, $(TARGET_DIRS), \
> $(call print-help-run,$(t)/all,Build for $(t));) \
> echo '')
> + @$(if $(HELPERS-y), \
> + echo 'Helper targets:'; \
> + $(foreach t, $(HELPERS-y), \
> + $(call print-help-run,$(t),Build $(shell basename $(t)));) \
> + echo '')
> @$(if $(TOOLS), \
> echo 'Tools targets:'; \
> $(foreach t, $(TOOLS), \
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Makefile: Let the 'help' target list the helper targets
2020-04-23 10:43 [PATCH] Makefile: Let the 'help' target list the helper targets Philippe Mathieu-Daudé
2020-05-04 8:53 ` Philippe Mathieu-Daudé
@ 2020-05-04 13:14 ` Stefan Hajnoczi
2020-05-21 14:39 ` Paolo Bonzini
2020-08-18 12:29 ` Philippe Mathieu-Daudé
3 siblings, 0 replies; 5+ messages in thread
From: Stefan Hajnoczi @ 2020-05-04 13:14 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: qemu-trivial, Paolo Bonzini, qemu-devel
[-- Attachment #1: Type: text/plain, Size: 1416 bytes --]
On Thu, Apr 23, 2020 at 12:43:45PM +0200, Philippe Mathieu-Daudé wrote:
> List the name of the helper targets when calling 'make help',
> along with the tool targets:
>
> $ make help
> [...]
>
> Helper targets:
> fsdev/virtfs-proxy-helper - Build virtfs-proxy-helper
> scsi/qemu-pr-helper - Build qemu-pr-helper
> qemu-bridge-helper - Build qemu-bridge-helper
> vhost-user-gpu - Build vhost-user-gpu
> virtiofsd - Build virtiofsd
>
> Tools targets:
> qemu-ga - Build qemu-ga tool
> qemu-keymap - Build qemu-keymap tool
> elf2dmp - Build elf2dmp tool
> ivshmem-client - Build ivshmem-client tool
> ivshmem-server - Build ivshmem-server tool
> qemu-nbd - Build qemu-nbd tool
> qemu-storage-daemon - Build qemu-storage-daemon tool
> qemu-img - Build qemu-img tool
> qemu-io - Build qemu-io tool
> qemu-edid - Build qemu-edid tool
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> configure | 5 +++--
> Makefile | 9 +++++++--
> 2 files changed, 10 insertions(+), 4 deletions(-)
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Makefile: Let the 'help' target list the helper targets
2020-04-23 10:43 [PATCH] Makefile: Let the 'help' target list the helper targets Philippe Mathieu-Daudé
2020-05-04 8:53 ` Philippe Mathieu-Daudé
2020-05-04 13:14 ` Stefan Hajnoczi
@ 2020-05-21 14:39 ` Paolo Bonzini
2020-08-18 12:29 ` Philippe Mathieu-Daudé
3 siblings, 0 replies; 5+ messages in thread
From: Paolo Bonzini @ 2020-05-21 14:39 UTC (permalink / raw)
To: Philippe Mathieu-Daudé, qemu-devel; +Cc: qemu-trivial
On 23/04/20 12:43, Philippe Mathieu-Daudé wrote:
> List the name of the helper targets when calling 'make help',
> along with the tool targets:
>
> $ make help
> [...]
>
> Helper targets:
> fsdev/virtfs-proxy-helper - Build virtfs-proxy-helper
> scsi/qemu-pr-helper - Build qemu-pr-helper
> qemu-bridge-helper - Build qemu-bridge-helper
> vhost-user-gpu - Build vhost-user-gpu
> virtiofsd - Build virtiofsd
>
> Tools targets:
> qemu-ga - Build qemu-ga tool
> qemu-keymap - Build qemu-keymap tool
> elf2dmp - Build elf2dmp tool
> ivshmem-client - Build ivshmem-client tool
> ivshmem-server - Build ivshmem-server tool
> qemu-nbd - Build qemu-nbd tool
> qemu-storage-daemon - Build qemu-storage-daemon tool
> qemu-img - Build qemu-img tool
> qemu-io - Build qemu-io tool
> qemu-edid - Build qemu-edid tool
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> configure | 5 +++--
> Makefile | 9 +++++++--
> 2 files changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/configure b/configure
> index 23b5e93752..caf880c38e 100755
> --- a/configure
> +++ b/configure
> @@ -6374,7 +6374,7 @@ if test "$softmmu" = yes ; then
> if test "$linux" = yes; then
> if test "$virtfs" != no && test "$cap_ng" = yes && test "$attr" = yes ; then
> virtfs=yes
> - tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
> + helpers="$helpers fsdev/virtfs-proxy-helper\$(EXESUF)"
> else
> if test "$virtfs" = yes; then
> error_exit "VirtFS requires libcap-ng devel and libattr devel"
> @@ -6389,7 +6389,7 @@ if test "$softmmu" = yes ; then
> fi
> mpath=no
> fi
> - tools="$tools scsi/qemu-pr-helper\$(EXESUF)"
> + helpers="$helpers scsi/qemu-pr-helper\$(EXESUF)"
> else
> if test "$virtfs" = yes; then
> error_exit "VirtFS is supported only on Linux"
> @@ -7630,6 +7630,7 @@ else
> QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES"
> fi
>
> +echo "HELPERS=$helpers" >> $config_host_mak
> echo "TOOLS=$tools" >> $config_host_mak
> echo "ROMS=$roms" >> $config_host_mak
> echo "MAKE=$make" >> $config_host_mak
> diff --git a/Makefile b/Makefile
> index 8a9113e666..021a0cd491 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -336,9 +336,9 @@ $(call set-vpath, $(SRC_PATH))
> LIBS+=-lz $(LIBS_TOOLS)
>
> vhost-user-json-y =
> -HELPERS-y =
> +HELPERS-y = $(HELPERS)
>
> -HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF)
> +HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) += qemu-bridge-helper$(EXESUF)
>
> ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy)
> HELPERS-y += vhost-user-gpu$(EXESUF)
> @@ -1255,6 +1255,11 @@ endif
> $(foreach t, $(TARGET_DIRS), \
> $(call print-help-run,$(t)/all,Build for $(t));) \
> echo '')
> + @$(if $(HELPERS-y), \
> + echo 'Helper targets:'; \
> + $(foreach t, $(HELPERS-y), \
> + $(call print-help-run,$(t),Build $(shell basename $(t)));) \
> + echo '')
> @$(if $(TOOLS), \
> echo 'Tools targets:'; \
> $(foreach t, $(TOOLS), \
>
Queued, thanks.
Paolo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Makefile: Let the 'help' target list the helper targets
2020-04-23 10:43 [PATCH] Makefile: Let the 'help' target list the helper targets Philippe Mathieu-Daudé
` (2 preceding siblings ...)
2020-05-21 14:39 ` Paolo Bonzini
@ 2020-08-18 12:29 ` Philippe Mathieu-Daudé
3 siblings, 0 replies; 5+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-08-18 12:29 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, Paolo Bonzini, Miroslav Rezanina
Hi Mirek,
On 4/23/20 12:43 PM, Philippe Mathieu-Daudé wrote:
> List the name of the helper targets when calling 'make help',
> along with the tool targets:
>
> $ make help
> [...]
>
> Helper targets:
> fsdev/virtfs-proxy-helper - Build virtfs-proxy-helper
> scsi/qemu-pr-helper - Build qemu-pr-helper
> qemu-bridge-helper - Build qemu-bridge-helper
> vhost-user-gpu - Build vhost-user-gpu
> virtiofsd - Build virtiofsd
>
> Tools targets:
> qemu-ga - Build qemu-ga tool
> qemu-keymap - Build qemu-keymap tool
> elf2dmp - Build elf2dmp tool
> ivshmem-client - Build ivshmem-client tool
> ivshmem-server - Build ivshmem-server tool
> qemu-nbd - Build qemu-nbd tool
> qemu-storage-daemon - Build qemu-storage-daemon tool
> qemu-img - Build qemu-img tool
> qemu-io - Build qemu-io tool
> qemu-edid - Build qemu-edid tool
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> configure | 5 +++--
> Makefile | 9 +++++++--
> 2 files changed, 10 insertions(+), 4 deletions(-)
>
> diff --git a/configure b/configure
> index 23b5e93752..caf880c38e 100755
> --- a/configure
> +++ b/configure
> @@ -6374,7 +6374,7 @@ if test "$softmmu" = yes ; then
> if test "$linux" = yes; then
> if test "$virtfs" != no && test "$cap_ng" = yes && test "$attr" = yes ; then
> virtfs=yes
> - tools="$tools fsdev/virtfs-proxy-helper\$(EXESUF)"
> + helpers="$helpers fsdev/virtfs-proxy-helper\$(EXESUF)"
> else
> if test "$virtfs" = yes; then
> error_exit "VirtFS requires libcap-ng devel and libattr devel"
> @@ -6389,7 +6389,7 @@ if test "$softmmu" = yes ; then
> fi
> mpath=no
> fi
> - tools="$tools scsi/qemu-pr-helper\$(EXESUF)"
> + helpers="$helpers scsi/qemu-pr-helper\$(EXESUF)"
Paolo said on IRC this patch didn't follow the recommendation
from https://www.mail-archive.com/qemu-devel@nongnu.org/msg524586.html
and moved qemu-pr-helper from /usr/bin to /usr/libexec.
FYI virtfs-proxy-helper might be also affected.
> else
> if test "$virtfs" = yes; then
> error_exit "VirtFS is supported only on Linux"
> @@ -7630,6 +7630,7 @@ else
> QEMU_INCLUDES="-iquote \$(SRC_PATH)/tcg/\$(ARCH) $QEMU_INCLUDES"
> fi
>
> +echo "HELPERS=$helpers" >> $config_host_mak
> echo "TOOLS=$tools" >> $config_host_mak
> echo "ROMS=$roms" >> $config_host_mak
> echo "MAKE=$make" >> $config_host_mak
> diff --git a/Makefile b/Makefile
> index 8a9113e666..021a0cd491 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -336,9 +336,9 @@ $(call set-vpath, $(SRC_PATH))
> LIBS+=-lz $(LIBS_TOOLS)
>
> vhost-user-json-y =
> -HELPERS-y =
> +HELPERS-y = $(HELPERS)
>
> -HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) = qemu-bridge-helper$(EXESUF)
> +HELPERS-$(call land,$(CONFIG_SOFTMMU),$(CONFIG_LINUX)) += qemu-bridge-helper$(EXESUF)
>
> ifeq ($(CONFIG_LINUX)$(CONFIG_VIRGL)$(CONFIG_GBM)$(CONFIG_TOOLS),yyyy)
> HELPERS-y += vhost-user-gpu$(EXESUF)
> @@ -1255,6 +1255,11 @@ endif
> $(foreach t, $(TARGET_DIRS), \
> $(call print-help-run,$(t)/all,Build for $(t));) \
> echo '')
> + @$(if $(HELPERS-y), \
> + echo 'Helper targets:'; \
> + $(foreach t, $(HELPERS-y), \
> + $(call print-help-run,$(t),Build $(shell basename $(t)));) \
> + echo '')
> @$(if $(TOOLS), \
> echo 'Tools targets:'; \
> $(foreach t, $(TOOLS), \
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-08-18 12:35 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-23 10:43 [PATCH] Makefile: Let the 'help' target list the helper targets Philippe Mathieu-Daudé
2020-05-04 8:53 ` Philippe Mathieu-Daudé
2020-05-04 13:14 ` Stefan Hajnoczi
2020-05-21 14:39 ` Paolo Bonzini
2020-08-18 12:29 ` Philippe Mathieu-Daudé
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.