* [Qemu-devel] [RFC PATCH-for-4.1] Makefile: Fix the NSIS Windows builds
@ 2019-07-13 16:58 Philippe Mathieu-Daudé
2019-08-06 12:44 ` Daniel P. Berrangé
0 siblings, 1 reply; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-07-13 16:58 UTC (permalink / raw)
To: qemu-devel
Cc: Fam Zheng, Adam Baxter, Daniel P . Berrange,
Philippe Mathieu-Daudé, Stefan Weil, Alex Bennée
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(+)
diff --git a/Makefile b/Makefile
index 1fcbaed62c..de4dfa2214 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
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [RFC PATCH-for-4.1] Makefile: Fix the NSIS Windows builds
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é
2019-08-06 13:25 ` Peter Maydell
0 siblings, 1 reply; 4+ messages in thread
From: Daniel P. Berrangé @ 2019-08-06 12:44 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Fam Zheng, Adam Baxter, Alex Bennée, qemu-devel, Stefan Weil
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 :|
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [RFC PATCH-for-4.1] Makefile: Fix the NSIS Windows builds
2019-08-06 12:44 ` Daniel P. Berrangé
@ 2019-08-06 13:25 ` Peter Maydell
2019-08-06 13:29 ` Daniel P. Berrangé
0 siblings, 1 reply; 4+ messages in thread
From: Peter Maydell @ 2019-08-06 13:25 UTC (permalink / raw)
To: Daniel P. Berrangé
Cc: Fam Zheng, Adam Baxter, Stefan Weil, QEMU Developers,
Alex Bennée, Philippe Mathieu-Daudé
On Tue, 6 Aug 2019 at 13:44, Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> 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>
I thought for a moment that this was another patch we'd missed putting
in 4.1, but it went in as commit b3ce38dcf93a12038ce on July 15th, so
we're OK.
thanks
-- PMM
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [RFC PATCH-for-4.1] Makefile: Fix the NSIS Windows builds
2019-08-06 13:25 ` Peter Maydell
@ 2019-08-06 13:29 ` Daniel P. Berrangé
0 siblings, 0 replies; 4+ messages in thread
From: Daniel P. Berrangé @ 2019-08-06 13:29 UTC (permalink / raw)
To: Peter Maydell
Cc: Fam Zheng, Adam Baxter, Alex Bennée, QEMU Developers,
Stefan Weil, Philippe Mathieu-Daudé
On Tue, Aug 06, 2019 at 02:25:27PM +0100, Peter Maydell wrote:
> On Tue, 6 Aug 2019 at 13:44, Daniel P. Berrangé <berrange@redhat.com> wrote:
> >
> > 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>
>
> I thought for a moment that this was another patch we'd missed putting
> in 4.1, but it went in as commit b3ce38dcf93a12038ce on July 15th, so
> we're OK.
Opps, sorry for the noise. I didn't see any response to the original
posting, so didn't realize it had been picked up.
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 :|
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-08-06 13:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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é
2019-08-06 13:25 ` Peter Maydell
2019-08-06 13:29 ` Daniel P. Berrangé
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.