[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH-for-4.1 v2 7/9] buildsys: The NSIS Windows build requi
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-ppc] [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 |
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é <address@hidden>
---
$ 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
- [Qemu-ppc] [PATCH-for-4.1 v2 0/9] tests/docker: Debian & MXE fixes, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-ppc] [NOTFORMERGE PATCH v2 1/9] tests/docker: Kludge to build the Fedora image, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-ppc] [PATCH-for-4.1 v2 2/9] tests/docker: Install Sphinx in the Debian images, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-ppc] [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
- [Qemu-ppc] [PATCH-for-4.1 v2 3/9] tests/docker: Install the NSIS tools in the MinGW capable images, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-ppc] [PATCH-for-4.1 v2 5/9] tests/docker: Install texinfo in the Fedora image, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-ppc] [RFC PATCH-for-4.1 v2 6/9] buildsys: The NSIS Windows build requires the documentation installed, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-ppc] [PATCH-for-4.1 v2 7/9] buildsys: The NSIS Windows build requires qemu-nsis.bmp installed,
Philippe Mathieu-Daudé <=
- [Qemu-ppc] [PATCH-for-4.1 v2 8/9] tests/docker: Let the test-mingw test generate a NSIS installer, Philippe Mathieu-Daudé, 2019/07/15
- [Qemu-ppc] [PATCH-for-4.1 v2 9/9] NSIS: Add missing firmware blobs, Philippe Mathieu-Daudé, 2019/07/15
- Re: [Qemu-ppc] [PATCH-for-4.1 v2 0/9] tests/docker: Debian & MXE fixes, Alex Bennée, 2019/07/16