From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: "Alex Bennée" <alex.bennee@linaro.org>,
qemu-devel@nongnu.org, "Stefan Weil" <sw@weilnetz.de>
Cc: "Fam Zheng" <fam@euphon.net>, "Thomas Huth" <thuth@redhat.com>,
"Laszlo Ersek" <lersek@redhat.com>,
"Helge Deller" <deller@gmx.de>,
"Cornelia Huck" <cohuck@redhat.com>,
"Christian Borntraeger" <borntraeger@de.ibm.com>,
qemu-s390x@nongnu.org, qemu-ppc@nongnu.org,
"Cédric Le Goater" <clg@kaod.org>,
"Richard Henderson" <rth@twiddle.net>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"David Gibson" <david@gibson.dropbear.id.au>
Subject: [Qemu-devel] [PATCH-for-4.1 v2 7/9] buildsys: The NSIS Windows build requires qemu-nsis.bmp installed
Date: Mon, 15 Jul 2019 19:48:14 +0200 [thread overview]
Message-ID: <20190715174817.18981-8-philmd@redhat.com> (raw)
In-Reply-To: <20190715174817.18981-1-philmd@redhat.com>
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>
---
$ 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(+)
diff --git a/Makefile b/Makefile
index f8dac48981..f2e5fd3316 100644
--- a/Makefile
+++ b/Makefile
@@ -761,6 +761,7 @@ pxe-pcnet.rom pxe-rtl8139.rom pxe-virtio.rom \
efi-e1000.rom efi-eepro100.rom efi-ne2k_pci.rom \
efi-pcnet.rom efi-rtl8139.rom efi-virtio.rom \
efi-e1000e.rom efi-vmxnet3.rom \
+qemu-nsis.bmp \
bamboo.dtb canyonlands.dtb petalogix-s3adsp1800.dtb petalogix-ml605.dtb \
multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin \
s390-ccw.img s390-netboot.img \
--
2.20.1
next prev parent reply other threads:[~2019-07-15 17:50 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-15 17:48 [Qemu-devel] [PATCH-for-4.1 v2 0/9] tests/docker: Debian & MXE fixes Philippe Mathieu-Daudé
2019-07-15 17:48 ` [Qemu-devel] [NOTFORMERGE PATCH v2 1/9] tests/docker: Kludge to build the Fedora image Philippe Mathieu-Daudé
2019-07-16 10:54 ` Alex Bennée
2019-07-16 13:03 ` Philippe Mathieu-Daudé
2019-09-19 15:45 ` Philippe Mathieu-Daudé
2019-07-15 17:48 ` [Qemu-devel] [PATCH-for-4.1 v2 2/9] tests/docker: Install Sphinx in the Debian images Philippe Mathieu-Daudé
2019-07-15 17:48 ` [Qemu-devel] [PATCH-for-4.1 v2 3/9] tests/docker: Install the NSIS tools in the MinGW capable images Philippe Mathieu-Daudé
2019-07-15 17:48 ` [Qemu-devel] [PATCH-for-4.1 v2 4/9] tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE images Philippe Mathieu-Daudé
2019-07-15 17:48 ` [Qemu-devel] [PATCH-for-4.1 v2 5/9] tests/docker: Install texinfo in the Fedora image Philippe Mathieu-Daudé
2019-07-15 17:48 ` [Qemu-devel] [RFC PATCH-for-4.1 v2 6/9] buildsys: The NSIS Windows build requires the documentation installed Philippe Mathieu-Daudé
2019-07-15 17:48 ` Philippe Mathieu-Daudé [this message]
2019-07-15 17:48 ` [Qemu-devel] [PATCH-for-4.1 v2 8/9] tests/docker: Let the test-mingw test generate a NSIS installer Philippe Mathieu-Daudé
2019-07-15 17:48 ` [Qemu-devel] [PATCH-for-4.1 v2 9/9] NSIS: Add missing firmware blobs Philippe Mathieu-Daudé
2019-07-15 23:33 ` Laszlo Ersek
2019-07-16 11:02 ` [Qemu-devel] [PATCH-for-4.1 v2 0/9] tests/docker: Debian & MXE fixes Alex Bennée
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=20190715174817.18981-8-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=borntraeger@de.ibm.com \
--cc=clg@kaod.org \
--cc=cohuck@redhat.com \
--cc=david@gibson.dropbear.id.au \
--cc=deller@gmx.de \
--cc=fam@euphon.net \
--cc=lersek@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=rth@twiddle.net \
--cc=sw@weilnetz.de \
--cc=thuth@redhat.com \
/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).