We install this file to data dir but since 0ab8ed18 it's no longer
required by any objects during "make". List it explicitly as a depended
target of install and fix the broken "make install" command.
Signed-off-by: Fam Zheng <famz@redhat.com>
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile b/Makefile
index 4b72a4c..b993741 100644
--- a/Makefile
+++ b/Makefile
@@ -589,7 +589,7 @@ endif
endif
-install: all $(if $(BUILD_DOCS),install-doc) \
+install: all $(if $(BUILD_DOCS),install-doc) $(BUILD_DIR)/trace-events-all \
install-datadir install-localstatedir
ifneq ($(TOOLS),)
$(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir))
--
2.9.3
On Sat, Feb 04, 2017 at 10:32:45PM +0800, Fam Zheng wrote: > We install this file to data dir but since 0ab8ed18 it's no longer > required by any objects during "make". List it explicitly as a depended > target of install and fix the broken "make install" command. > > Signed-off-by: Fam Zheng <famz@redhat.com> > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Reviewed-by: Daniel P. Berrange <berrange@redhat.com> Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://entangle-photo.org -o- http://search.cpan.org/~danberr/ :|
On 02/04/2017 03:32 PM, Fam Zheng wrote: > We install this file to data dir but since 0ab8ed18 it's no longer > required by any objects during "make". List it explicitly as a depended > target of install and fix the broken "make install" command. > > Signed-off-by: Fam Zheng <famz@redhat.com> Tested-by: Christian Borntraeger <borntraeger@de.ibm.com> > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Makefile b/Makefile > index 4b72a4c..b993741 100644 > --- a/Makefile > +++ b/Makefile > @@ -589,7 +589,7 @@ endif > endif > > > -install: all $(if $(BUILD_DOCS),install-doc) \ > +install: all $(if $(BUILD_DOCS),install-doc) $(BUILD_DIR)/trace-events-all \ > install-datadir install-localstatedir > ifneq ($(TOOLS),) > $(call install-prog,$(subst qemu-ga,qemu-ga$(EXESUF),$(TOOLS)),$(DESTDIR)$(bindir)) >
On Sat, Feb 04, 2017 at 10:32:45PM +0800, Fam Zheng wrote: > We install this file to data dir but since 0ab8ed18 it's no longer > required by any objects during "make". List it explicitly as a depended > target of install and fix the broken "make install" command. > > Signed-off-by: Fam Zheng <famz@redhat.com> > --- > Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Thanks, applied to my tracing tree: https://github.com/stefanha/qemu/commits/tracing Stefan
On 02/07/2017 07:14 AM, Stefan Hajnoczi wrote: > On Sat, Feb 04, 2017 at 10:32:45PM +0800, Fam Zheng wrote: >> We install this file to data dir but since 0ab8ed18 it's no longer >> required by any objects during "make". List it explicitly as a depended >> target of install and fix the broken "make install" command. >> >> Signed-off-by: Fam Zheng <famz@redhat.com> >> --- >> Makefile | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) > > Thanks, applied to my tracing tree: > https://github.com/stefanha/qemu/commits/tracing > > Stefan > Are there plans to commit this change? AFAICS, ToT builds are broken without this change. Thanks, Doug
On Tue, Feb 07, 2017 at 02:25:31PM -0800, Doug Gilmore wrote: > On 02/07/2017 07:14 AM, Stefan Hajnoczi wrote: > > On Sat, Feb 04, 2017 at 10:32:45PM +0800, Fam Zheng wrote: > >> We install this file to data dir but since 0ab8ed18 it's no longer > >> required by any objects during "make". List it explicitly as a depended > >> target of install and fix the broken "make install" command. > >> > >> Signed-off-by: Fam Zheng <famz@redhat.com> > >> --- > >> Makefile | 2 +- > >> 1 file changed, 1 insertion(+), 1 deletion(-) > > > > Thanks, applied to my tracing tree: > > https://github.com/stefanha/qemu/commits/tracing > > > > Stefan > > > Are there plans to commit this change? > > AFAICS, ToT builds are broken without this change. Hi Doug, I've been mostly offline due to illness but am back now. The pull request will be sent today. Stefan
© 2016 - 2024 Red Hat, Inc.