* [Qemu-devel] [PATCH for-4.1] Makefile: Fix "make install" when "make all" needs work
@ 2019-07-12 5:59 Markus Armbruster
2019-07-12 8:27 ` Daniel P. Berrangé
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Markus Armbruster @ 2019-07-12 5:59 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, Mark Cave-Ayland, Guenter Roeck
Until recently, target install used to recurse into target directories
in its recipe: it ran make install in a for-loop. Since target
install depends on target all, this trivially ensured we run the
sub-make install only after completing target all.
Commit 1338a4b "Makefile: Reuse all's recursion machinery for clean
and install" moved the target recursion to dependencies. That's good
(the commit message explains why), but I forgot to add dependencies to
ensure make runs the sub-make install only after completing target
all. Do that now.
Fixes: 1338a4b72659ce08eacb9de0205fe16202a22d9c
Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reported-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile b/Makefile
index 1fcbaed62c..09b77e8a7b 100644
--- a/Makefile
+++ b/Makefile
@@ -522,6 +522,7 @@ $(ROM_DIRS_RULES):
recurse-all: $(addsuffix /all, $(TARGET_DIRS) $(ROM_DIRS))
recurse-clean: $(addsuffix /clean, $(TARGET_DIRS) $(ROM_DIRS))
recurse-install: $(addsuffix /install, $(TARGET_DIRS))
+$(addsuffix /install, $(TARGET_DIRS)): all
$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h
$(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<,"RC","version.o")
--
2.21.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.1] Makefile: Fix "make install" when "make all" needs work
2019-07-12 5:59 [Qemu-devel] [PATCH for-4.1] Makefile: Fix "make install" when "make all" needs work Markus Armbruster
@ 2019-07-12 8:27 ` Daniel P. Berrangé
2019-07-12 9:09 ` Stefano Garzarella
2019-07-12 19:43 ` Mark Cave-Ayland
2 siblings, 0 replies; 4+ messages in thread
From: Daniel P. Berrangé @ 2019-07-12 8:27 UTC (permalink / raw)
To: Markus Armbruster
Cc: peter.maydell, Mark Cave-Ayland, qemu-devel, Guenter Roeck
On Fri, Jul 12, 2019 at 07:59:35AM +0200, Markus Armbruster wrote:
> Until recently, target install used to recurse into target directories
> in its recipe: it ran make install in a for-loop. Since target
> install depends on target all, this trivially ensured we run the
> sub-make install only after completing target all.
>
> Commit 1338a4b "Makefile: Reuse all's recursion machinery for clean
> and install" moved the target recursion to dependencies. That's good
> (the commit message explains why), but I forgot to add dependencies to
> ensure make runs the sub-make install only after completing target
> all. Do that now.
>
> Fixes: 1338a4b72659ce08eacb9de0205fe16202a22d9c
> Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> Reported-by: Guenter Roeck <linux@roeck-us.net>
> Tested-by: Guenter Roeck <linux@roeck-us.net>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> Makefile | 1 +
> 1 file changed, 1 insertion(+)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.1] Makefile: Fix "make install" when "make all" needs work
2019-07-12 5:59 [Qemu-devel] [PATCH for-4.1] Makefile: Fix "make install" when "make all" needs work Markus Armbruster
2019-07-12 8:27 ` Daniel P. Berrangé
@ 2019-07-12 9:09 ` Stefano Garzarella
2019-07-12 19:43 ` Mark Cave-Ayland
2 siblings, 0 replies; 4+ messages in thread
From: Stefano Garzarella @ 2019-07-12 9:09 UTC (permalink / raw)
To: Markus Armbruster
Cc: peter.maydell, Mark Cave-Ayland, qemu-devel, Guenter Roeck
On Fri, Jul 12, 2019 at 07:59:35AM +0200, Markus Armbruster wrote:
> Until recently, target install used to recurse into target directories
> in its recipe: it ran make install in a for-loop. Since target
> install depends on target all, this trivially ensured we run the
> sub-make install only after completing target all.
>
> Commit 1338a4b "Makefile: Reuse all's recursion machinery for clean
> and install" moved the target recursion to dependencies. That's good
> (the commit message explains why), but I forgot to add dependencies to
> ensure make runs the sub-make install only after completing target
> all. Do that now.
>
> Fixes: 1338a4b72659ce08eacb9de0205fe16202a22d9c
> Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> Reported-by: Guenter Roeck <linux@roeck-us.net>
> Tested-by: Guenter Roeck <linux@roeck-us.net>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> Makefile | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/Makefile b/Makefile
> index 1fcbaed62c..09b77e8a7b 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -522,6 +522,7 @@ $(ROM_DIRS_RULES):
> recurse-all: $(addsuffix /all, $(TARGET_DIRS) $(ROM_DIRS))
> recurse-clean: $(addsuffix /clean, $(TARGET_DIRS) $(ROM_DIRS))
> recurse-install: $(addsuffix /install, $(TARGET_DIRS))
> +$(addsuffix /install, $(TARGET_DIRS)): all
>
> $(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h
> $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<,"RC","version.o")
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH for-4.1] Makefile: Fix "make install" when "make all" needs work
2019-07-12 5:59 [Qemu-devel] [PATCH for-4.1] Makefile: Fix "make install" when "make all" needs work Markus Armbruster
2019-07-12 8:27 ` Daniel P. Berrangé
2019-07-12 9:09 ` Stefano Garzarella
@ 2019-07-12 19:43 ` Mark Cave-Ayland
2 siblings, 0 replies; 4+ messages in thread
From: Mark Cave-Ayland @ 2019-07-12 19:43 UTC (permalink / raw)
To: Markus Armbruster, qemu-devel; +Cc: peter.maydell, Guenter Roeck
On 12/07/2019 06:59, Markus Armbruster wrote:
> Until recently, target install used to recurse into target directories
> in its recipe: it ran make install in a for-loop. Since target
> install depends on target all, this trivially ensured we run the
> sub-make install only after completing target all.
>
> Commit 1338a4b "Makefile: Reuse all's recursion machinery for clean
> and install" moved the target recursion to dependencies. That's good
> (the commit message explains why), but I forgot to add dependencies to
> ensure make runs the sub-make install only after completing target
> all. Do that now.
>
> Fixes: 1338a4b72659ce08eacb9de0205fe16202a22d9c
> Reported-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> Reported-by: Guenter Roeck <linux@roeck-us.net>
> Tested-by: Guenter Roeck <linux@roeck-us.net>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
> Makefile | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/Makefile b/Makefile
> index 1fcbaed62c..09b77e8a7b 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -522,6 +522,7 @@ $(ROM_DIRS_RULES):
> recurse-all: $(addsuffix /all, $(TARGET_DIRS) $(ROM_DIRS))
> recurse-clean: $(addsuffix /clean, $(TARGET_DIRS) $(ROM_DIRS))
> recurse-install: $(addsuffix /install, $(TARGET_DIRS))
> +$(addsuffix /install, $(TARGET_DIRS)): all
>
> $(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h
> $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<,"RC","version.o")
>
I've just tried this on my faster workstation and it now works fine with all of -j2,
-j4 and -j8.
Tested-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
ATB,
Mark.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-07-12 19:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-12 5:59 [Qemu-devel] [PATCH for-4.1] Makefile: Fix "make install" when "make all" needs work Markus Armbruster
2019-07-12 8:27 ` Daniel P. Berrangé
2019-07-12 9:09 ` Stefano Garzarella
2019-07-12 19:43 ` Mark Cave-Ayland
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.