[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 14/23] buildsys: The NSIS Windows build requires qemu
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 14/23] buildsys: The NSIS Windows build requires qemu-nsis.bmp installed |
Date: |
Tue, 23 Jul 2019 11:36:03 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
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>
Message-Id: <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
diff --git a/Makefile b/Makefile
index b3357691cad..cfab1561b9c 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-devel] [PULL 05/23] tests/docker: Install Ubuntu images noninteractively, (continued)
- [Qemu-devel] [PULL 05/23] tests/docker: Install Ubuntu images noninteractively, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 07/23] tests/dockerfiles: update the win cross builds to stretch, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 09/23] tests/docker: Install Sphinx in the Debian images, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 10/23] tests/docker: Install the NSIS tools in the MinGW capable images, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 12/23] tests/docker: Install texinfo in the Fedora image, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 23/23] gitlab-ci: Remove qcow2 tests that are handled by "make check" already, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 11/23] tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE images, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 19/23] tests/docker: invoke the DEBUG shell with --noprofile/--norc, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 21/23] tests/qemu-iotests/group: Remove some more tests from the "auto" group, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 17/23] hw/i386: also turn off VMMOUSE is VMPORT is disabled, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 14/23] buildsys: The NSIS Windows build requires qemu-nsis.bmp installed,
Alex Bennée <=
- [Qemu-devel] [PULL 22/23] tests: Run the iotests during "make check" again, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 18/23] travis: enable travis_retry for check phase, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 13/23] buildsys: The NSIS Windows build requires the documentation installed, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 15/23] tests/docker: Let the test-mingw test generate a NSIS installer, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 20/23] tests/qemu-iotests/check: Allow tests without groups, Alex Bennée, 2019/07/23
- [Qemu-devel] [PULL 16/23] NSIS: Add missing firmware blobs, Alex Bennée, 2019/07/23
- Re: [Qemu-devel] [PULL for 4.1-rc2 00/23] testing updates (green CI!), Peter Maydell, 2019/07/23