| Message ID | 1393532883-12585-1-git-send-email-sw@weilnetz.de |
|---|---|
| State | Accepted |
| Headers | show |
Il 27/02/2014 21:28, Stefan Weil ha scritto: > Comment from Makefile.objs: > > # block-obj-y is code used by both qemu system emulation and qemu-img > > The system emulation needs this dependency (which was missing in Makefile), > otherwise builds without tools (or massive parallel builds) fail. > > Signed-off-by: Stefan Weil <sw@weilnetz.de> > --- > Makefile | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/Makefile b/Makefile > index a28a3c8..a0dafbf 100644 > --- a/Makefile > +++ b/Makefile > @@ -159,6 +159,7 @@ qemu-options.def: $(SRC_PATH)/qemu-options.hx > SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) > SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES)) > > +$(SOFTMMU_SUBDIR_RULES): $(block-obj-y) > $(SOFTMMU_SUBDIR_RULES): config-all-devices.mak > > subdir-%: > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
On 4 March 2014 12:55, Paolo Bonzini <pbonzini@redhat.com> wrote: > Il 27/02/2014 21:28, Stefan Weil ha scritto: > >> Comment from Makefile.objs: >> >> # block-obj-y is code used by both qemu system emulation and qemu-img >> >> The system emulation needs this dependency (which was missing in >> Makefile), >> otherwise builds without tools (or massive parallel builds) fail. >> >> Signed-off-by: Stefan Weil <sw@weilnetz.de> >> --- >> Makefile | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/Makefile b/Makefile >> index a28a3c8..a0dafbf 100644 >> --- a/Makefile >> +++ b/Makefile >> @@ -159,6 +159,7 @@ qemu-options.def: $(SRC_PATH)/qemu-options.hx >> SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) >> SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES)) >> >> +$(SOFTMMU_SUBDIR_RULES): $(block-obj-y) >> $(SOFTMMU_SUBDIR_RULES): config-all-devices.mak >> >> subdir-%: >> > > Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Applied, thanks. -- PMM
Am 27.02.2014 21:28, schrieb Stefan Weil: > Comment from Makefile.objs: > > # block-obj-y is code used by both qemu system emulation and qemu-img Hello Peter, the comment which I cited above got lost when you applied the patch to QEMU master (maybe because it started with a #). Regards Stefan > > The system emulation needs this dependency (which was missing in Makefile), > otherwise builds without tools (or massive parallel builds) fail. > > Signed-off-by: Stefan Weil <sw@weilnetz.de>
On 4 March 2014 13:35, Stefan Weil <sw@weilnetz.de> wrote: > Am 27.02.2014 21:28, schrieb Stefan Weil: >> Comment from Makefile.objs: >> >> # block-obj-y is code used by both qemu system emulation and qemu-img > > > Hello Peter, > > the comment which I cited above got lost when you applied the patch to > QEMU master (maybe because it started with a #). Yes, probably happened as part of a 'git commit --amend' when I added my signoff. Probably best to avoid starting lines in commit messages with a '#' :-) thanks -- PMM
diff --git a/Makefile b/Makefile index a28a3c8..a0dafbf 100644 --- a/Makefile +++ b/Makefile @@ -159,6 +159,7 @@ qemu-options.def: $(SRC_PATH)/qemu-options.hx SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS)) SOFTMMU_SUBDIR_RULES=$(filter %-softmmu,$(SUBDIR_RULES)) +$(SOFTMMU_SUBDIR_RULES): $(block-obj-y) $(SOFTMMU_SUBDIR_RULES): config-all-devices.mak subdir-%:
Comment from Makefile.objs: # block-obj-y is code used by both qemu system emulation and qemu-img The system emulation needs this dependency (which was missing in Makefile), otherwise builds without tools (or massive parallel builds) fail. Signed-off-by: Stefan Weil <sw@weilnetz.de> --- Makefile | 1 + 1 file changed, 1 insertion(+)