From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33342) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyovV-0006Bi-Mo for qemu-devel@nongnu.org; Tue, 17 Nov 2015 17:40:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZyovS-0002hr-FA for qemu-devel@nongnu.org; Tue, 17 Nov 2015 17:40:37 -0500 Received: from mail-ob0-x230.google.com ([2607:f8b0:4003:c01::230]:34459) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyovS-0002hZ-97 for qemu-devel@nongnu.org; Tue, 17 Nov 2015 17:40:34 -0500 Received: by obbbj7 with SMTP id bj7so19186902obb.1 for ; Tue, 17 Nov 2015 14:40:33 -0800 (PST) Sender: fluxion Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Roth In-Reply-To: <564A52C5.9020504@weilnetz.de> References: <1447603950-22796-1-git-send-email-mdroth@linux.vnet.ibm.com> <564A52C5.9020504@weilnetz.de> Message-ID: <20151117224019.6284.83835@loki> Date: Tue, 17 Nov 2015 16:40:19 -0600 Subject: Re: [Qemu-devel] [PATCH for-2.5] makefile: fix w32 install target for qemu-ga List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Stefan Weil , qemu-devel@nongnu.org Cc: Paolo Bonzini Quoting Stefan Weil (2015-11-16 16:03:49) > This mail arrived with one day delay (obviously caused by the > mailing list server). Please see my comments below. > = > Am 15.11.2015 um 17:12 schrieb Michael Roth: > > fafcaf1 added a 'qemu-ga' install target on w32, which can be used > > in place of the existing qemu-ga.exe target to also handle dealing > > with other components such as DLLs for VSS/fsfreeze and generating > > an MSI package if appropriate configure options are present. > > > > As part of that, qemu-ga$(EXESUF) was removed from $TOOLS in favor > > of this new qemu-ga target. > > > > The install rule however relies on a direct mapping of the $TOOLS > > entry to the actual resulting binary. In the case of w32, qemu-ga > > is not identical to qemu-ga$(EXESUF), and the install recipe fails > > to find the 'qemu-ga' binary. > > > > Fix this by essentially remapping 'qemu-ga' back to 'qemu-ga.exe' > > in the install recipe. > > > > This raises the question of whether or not qemu-ga should continue > > to live in TOOLS as opposed to it's own special target, but as a > = > its? > = > > late fix for a regression in 2.5 this commit should be safer, since > > we rely on qemu-ga's presence in $TOOLS in several places throughout > > Makefile. > > > > Reported-by: Stefan Weil > > Cc: Paolo Bonzini > > Signed-off-by: Michael Roth > > --- > > Makefile | 6 +++++- > > 1 file changed, 5 insertions(+), 1 deletion(-) > > > > diff --git a/Makefile b/Makefile > > index fc1f8bb..8acda9e 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -440,7 +440,11 @@ endif > > install: all $(if $(BUILD_DOCS),install-doc) \ > > install-datadir install-localstatedir > > ifneq ($(TOOLS),) > > - $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) > > + $(call install-prog,$(filter-out qemu-ga,$(TOOLS)),$(DESTDIR)$(bi= ndir)) > > + # qemu-ga is included in TOOLS, but we need special install rules= for w32 > > +ifneq (,$(findstring qemu-ga,$(TOOLS))) > > + $(call install-prog,qemu-ga$(EXESUF),$(DESTDIR)$(bindir)) > > +endif > > endif > > ifneq ($(CONFIG_MODULES),) > > $(INSTALL_DIR) "$(DESTDIR)$(qemu_moddir)" > = > Reviewed-by: Stefan Weil > = > The patch is not pretty at all, but it works for 2.5. > = > We should improve this and also some redundant dependencies > like this one later: > = > $(QEMU_GA_MSI): qemu-ga.exe $(QGA_VSS_PROVIDER) > qemu-ga: qemu-ga$(EXESUF) $(QGA_VSS_PROVIDER) $(QEMU_GA_MSI) Agreed. Will look at this as part of cleaning up the TOOLS hacks. Thanks for the review, applied to qga tree with commit msg fixup: https://github.com/mdroth/qemu/commits/qga > = > Thanks, > Stefan > = >=20