Re: [Qemu-devel] [PATCH v2] NSIS: Add missing firmware blobs

["Alex Bennée" <alex.bennee@linaro.org>]

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