From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39901) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyRsS-0005x2-No for qemu-devel@nongnu.org; Mon, 16 Nov 2015 17:03:57 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZyRsP-0003Bn-CX for qemu-devel@nongnu.org; Mon, 16 Nov 2015 17:03:56 -0500 Received: from v220110690675601.yourvserver.net ([37.221.199.173]:44421) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZyRsP-0003BO-6L for qemu-devel@nongnu.org; Mon, 16 Nov 2015 17:03:53 -0500 Message-ID: <564A52C5.9020504@weilnetz.de> Date: Mon, 16 Nov 2015 23:03:49 +0100 From: Stefan Weil MIME-Version: 1.0 References: <1447603950-22796-1-git-send-email-mdroth@linux.vnet.ibm.com> In-Reply-To: <1447603950-22796-1-git-send-email-mdroth@linux.vnet.ibm.com> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: quoted-printable 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: Michael Roth , qemu-devel@nongnu.org Cc: Paolo Bonzini 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)$(bindir= )) > + # 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) Thanks, Stefan