qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrangé" <berrange@redhat.com>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: "Fam Zheng" <fam@euphon.net>,
	"Adam Baxter" <voltagex@voltagex.org>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	qemu-devel@nongnu.org, "Stefan Weil" <sw@weilnetz.de>
Subject: Re: [Qemu-devel] [RFC PATCH-for-4.1] Makefile: Fix the NSIS Windows builds
Date: Tue, 6 Aug 2019 13:44:08 +0100	[thread overview]
Message-ID: <20190806124408.GE14887@redhat.com> (raw)
In-Reply-To: <20190713165856.29883-1-philmd@redhat.com>

On Sat, Jul 13, 2019 at 06:58:56PM +0200, Philippe Mathieu-Daudé wrote:
> The qemu-nsis.bmp file was not listed with the other blobs, thus
> not installed in the ${BINDIR} location.
> 
> This fixes:
> 
>   $ make installer
>   [...]
>   (cd /tmp/qemu-nsis; \
>            for i in qemu-system-*.exe; do \
>              arch=${i%.exe}; \
>              arch=${arch#qemu-system-}; \
>              echo Section \"$arch\" Section_$arch; \
>              echo SetOutPath \"\$INSTDIR\"; \
>              echo File \"\${BINDIR}\\$i\"; \
>              echo SectionEnd; \
>            done \
>           ) >/tmp/qemu-nsis/system-emulations.nsh
>   makensis -V2 -NOCD \
>                   -DCONFIG_DOCUMENTATION="y" \
>                    \
>                   -DBINDIR="/tmp/qemu-nsis" \
>                    \
>                   -DSRCDIR="/home/phil/source/qemu" \
>                   -DOUTFILE="qemu-setup-4.0.90.exe" \
>                   -DDISPLAYVERSION="4.0.90" \
>                   /home/phil/source/qemu/qemu.nsi
>   File: "/tmp/qemu-nsis\*.bmp" -> no files found.
>   Usage: File [/nonfatal] [/a] ([/r] [/x filespec [...]] filespec [...] |
>      /oname=outfile one_file_only)
>   Error in script "/home/phil/source/qemu/qemu.nsi" on line 122 -- aborting creation process
>   Makefile:1077: recipe for target 'qemu-setup-4.0.90.exe' failed
>   make: *** [qemu-setup-4.0.90.exe] Error 1
> 
> Fixes: https://bugs.launchpad.net/bugs/1836453
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> Based-on: 20190713163558.13204-1-philmd@redhat.com
> https://lists.gnu.org/archive/html/qemu-devel/2019-07/msg03204.html
> 
> $ file qemu-setup-4.0.90.exe
> qemu-setup-4.0.90.exe: PE32 executable (GUI) Intel 80386 (stripped to external PDB), for MS Windows, Nullsoft Installer self-extracting archive
> ---
>  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 :|


  reply	other threads:[~2019-08-06 12:44 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-13 16:58 [Qemu-devel] [RFC PATCH-for-4.1] Makefile: Fix the NSIS Windows builds Philippe Mathieu-Daudé
2019-08-06 12:44 ` Daniel P. Berrangé [this message]
2019-08-06 13:25   ` Peter Maydell
2019-08-06 13:29     ` Daniel P. Berrangé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190806124408.GE14887@redhat.com \
    --to=berrange@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=fam@euphon.net \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=sw@weilnetz.de \
    --cc=voltagex@voltagex.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).