* [Qemu-devel] [PATCH v2] NSIS: Add missing firmware blobs
@ 2019-07-23 7:02 Philippe Mathieu-Daudé
2019-07-23 10:25 ` Alex Bennée
0 siblings, 1 reply; 2+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-07-23 7:02 UTC (permalink / raw)
To: qemu-devel; +Cc: Stefan Weil, Alex Bennée, Philippe Mathieu-Daudé
Various firmwares has been added in the pc-bios/ directory:
- CCW (since commit 0c1fecdd523)
- skiboot (since commit bcad45de6a0)
- EDK2 (since commit f7fa38b74c3)
Since we install qemu-system able to run the architectures
targetted by these firmware, include them in the NSIS exe.
Reviewed-by: Stefan Weil <sw@weilnetz.de>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
v2: Add *.ndrv, update the Uninstall section (Stefan)
---
qemu.nsi | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/qemu.nsi b/qemu.nsi
index 75f1608b9e..d0df0f4e3a 100644
--- a/qemu.nsi
+++ b/qemu.nsi
@@ -106,6 +106,9 @@ RequestExecutionLevel admin
;--------------------------------
; The stuff to install.
+;
+; Remember to keep the "Uninstall" section in sync.
+
Section "${PRODUCT} (required)"
SectionIn RO
@@ -122,6 +125,10 @@ Section "${PRODUCT} (required)"
File "${BINDIR}\*.bmp"
File "${BINDIR}\*.bin"
File "${BINDIR}\*.dtb"
+ File "${BINDIR}\*.fd"
+ File "${BINDIR}\*.img"
+ File "${BINDIR}\*.lid"
+ File "${BINDIR}\*.ndrv"
File "${BINDIR}\*.rom"
File "${BINDIR}\openbios-*"
@@ -210,6 +217,10 @@ Section "Uninstall"
Delete "$INSTDIR\*.bin"
Delete "$INSTDIR\*.dll"
Delete "$INSTDIR\*.dtb"
+ Delete "$INSTDIR\*.fd"
+ Delete "$INSTDIR\*.img"
+ Delete "$INSTDIR\*.lid"
+ Delete "$INSTDIR\*.ndrv"
Delete "$INSTDIR\*.rom"
Delete "$INSTDIR\openbios-*"
Delete "$INSTDIR\qemu-img.exe"
--
2.20.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH v2] NSIS: Add missing firmware blobs
2019-07-23 7:02 [Qemu-devel] [PATCH v2] NSIS: Add missing firmware blobs Philippe Mathieu-Daudé
@ 2019-07-23 10:25 ` Alex Bennée
0 siblings, 0 replies; 2+ messages in thread
From: Alex Bennée @ 2019-07-23 10:25 UTC (permalink / raw)
To: Philippe Mathieu-Daudé; +Cc: Stefan Weil, qemu-devel
Philippe Mathieu-Daudé <philmd@redhat.com> writes:
> Various firmwares has been added in the pc-bios/ directory:
>
> - CCW (since commit 0c1fecdd523)
> - skiboot (since commit bcad45de6a0)
> - EDK2 (since commit f7fa38b74c3)
>
> Since we install qemu-system able to run the architectures
> targetted by these firmware, include them in the NSIS exe.
>
> Reviewed-by: Stefan Weil <sw@weilnetz.de>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Queued to testing/next, thanks.
> ---
> v2: Add *.ndrv, update the Uninstall section (Stefan)
> ---
> qemu.nsi | 11 +++++++++++
> 1 file changed, 11 insertions(+)
>
> diff --git a/qemu.nsi b/qemu.nsi
> index 75f1608b9e..d0df0f4e3a 100644
> --- a/qemu.nsi
> +++ b/qemu.nsi
> @@ -106,6 +106,9 @@ RequestExecutionLevel admin
> ;--------------------------------
>
> ; The stuff to install.
> +;
> +; Remember to keep the "Uninstall" section in sync.
> +
> Section "${PRODUCT} (required)"
>
> SectionIn RO
> @@ -122,6 +125,10 @@ Section "${PRODUCT} (required)"
> File "${BINDIR}\*.bmp"
> File "${BINDIR}\*.bin"
> File "${BINDIR}\*.dtb"
> + File "${BINDIR}\*.fd"
> + File "${BINDIR}\*.img"
> + File "${BINDIR}\*.lid"
> + File "${BINDIR}\*.ndrv"
> File "${BINDIR}\*.rom"
> File "${BINDIR}\openbios-*"
>
> @@ -210,6 +217,10 @@ Section "Uninstall"
> Delete "$INSTDIR\*.bin"
> Delete "$INSTDIR\*.dll"
> Delete "$INSTDIR\*.dtb"
> + Delete "$INSTDIR\*.fd"
> + Delete "$INSTDIR\*.img"
> + Delete "$INSTDIR\*.lid"
> + Delete "$INSTDIR\*.ndrv"
> Delete "$INSTDIR\*.rom"
> Delete "$INSTDIR\openbios-*"
> Delete "$INSTDIR\qemu-img.exe"
--
Alex Bennée
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-07-23 10:25 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-23 7:02 [Qemu-devel] [PATCH v2] NSIS: Add missing firmware blobs Philippe Mathieu-Daudé
2019-07-23 10:25 ` Alex Bennée
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.