qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Alex Bennée" <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>,
	"Stefan Weil" <sw@weilnetz.de>,
	"Philippe Mathieu-Daudé" <philmd@redhat.com>,
	qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 16/23] NSIS: Add missing firmware blobs
Date: Tue, 23 Jul 2019 11:36:05 +0100	[thread overview]
Message-ID: <20190723103612.5600-17-alex.bennee@linaro.org> (raw)
In-Reply-To: <20190723103612.5600-1-alex.bennee@linaro.org>

From: Philippe Mathieu-Daudé <philmd@redhat.com>

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>
Message-Id: <20190723070218.3606-1-philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

diff --git a/qemu.nsi b/qemu.nsi
index 75f1608b9e0..d0df0f4e3a1 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



  parent reply	other threads:[~2019-07-23 10:43 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-07-23 10:35 [Qemu-devel] [PULL for 4.1-rc2 00/23] testing updates (green CI!) Alex Bennée
2019-07-23 10:35 ` [Qemu-devel] [PULL 01/23] archive-source: also create a stash for submodules Alex Bennée
2019-07-23 10:35 ` [Qemu-devel] [PULL 02/23] tests/docker: add test-misc for building tools & docs Alex Bennée
2019-07-23 10:35 ` [Qemu-devel] [PULL 03/23] tests/docker: Install Sphinx in the Ubuntu images Alex Bennée
2019-07-23 10:35 ` [Qemu-devel] [PULL 04/23] tests/docker: Install Sphinx in the Fedora image Alex Bennée
2019-07-23 10:35 ` [Qemu-devel] [PULL 05/23] tests/docker: Install Ubuntu images noninteractively Alex Bennée
2019-07-23 10:35 ` [Qemu-devel] [PULL 06/23] tests/migration-test: don't spam the logs when we fail Alex Bennée
2019-07-23 10:35 ` [Qemu-devel] [PULL 07/23] tests/dockerfiles: update the win cross builds to stretch Alex Bennée
2019-07-23 10:35 ` [Qemu-devel] [PULL 08/23] shippable: re-enable the windows cross builds Alex Bennée
2019-07-23 10:35 ` [Qemu-devel] [PULL 09/23] tests/docker: Install Sphinx in the Debian images Alex Bennée
2019-07-23 10:35 ` [Qemu-devel] [PULL 10/23] tests/docker: Install the NSIS tools in the MinGW capable images Alex Bennée
2019-07-23 10:36 ` [Qemu-devel] [PULL 11/23] tests/docker: Set the correct cross-PKG_CONFIG_PATH in the MXE images Alex Bennée
2019-07-23 10:36 ` [Qemu-devel] [PULL 12/23] tests/docker: Install texinfo in the Fedora image Alex Bennée
2019-07-23 10:36 ` [Qemu-devel] [PULL 13/23] buildsys: The NSIS Windows build requires the documentation installed Alex Bennée
2019-07-23 10:36 ` [Qemu-devel] [PULL 14/23] buildsys: The NSIS Windows build requires qemu-nsis.bmp installed Alex Bennée
2019-07-23 10:36 ` [Qemu-devel] [PULL 15/23] tests/docker: Let the test-mingw test generate a NSIS installer Alex Bennée
2019-07-23 10:36 ` Alex Bennée [this message]
2019-07-23 10:36 ` [Qemu-devel] [PULL 17/23] hw/i386: also turn off VMMOUSE is VMPORT is disabled Alex Bennée
2019-07-23 10:36 ` [Qemu-devel] [PULL 18/23] travis: enable travis_retry for check phase Alex Bennée
2019-07-23 10:36 ` [Qemu-devel] [PULL 19/23] tests/docker: invoke the DEBUG shell with --noprofile/--norc Alex Bennée
2019-07-23 10:36 ` [Qemu-devel] [PULL 20/23] tests/qemu-iotests/check: Allow tests without groups Alex Bennée
2019-07-23 10:36 ` [Qemu-devel] [PULL 21/23] tests/qemu-iotests/group: Remove some more tests from the "auto" group Alex Bennée
2019-07-23 10:36 ` [Qemu-devel] [PULL 22/23] tests: Run the iotests during "make check" again Alex Bennée
2019-07-23 10:36 ` [Qemu-devel] [PULL 23/23] gitlab-ci: Remove qcow2 tests that are handled by "make check" already Alex Bennée
2019-07-23 11:35 ` [Qemu-devel] [PULL for 4.1-rc2 00/23] testing updates (green CI!) Peter Maydell
2019-07-23 11:46   ` Alex Bennée
2019-07-23 12:16     ` Philippe Mathieu-Daudé
2019-07-23 12:31       ` Peter Maydell
2019-07-23 12:58         ` Alex Bennée
2019-07-23 13:01           ` Peter Maydell
2019-07-23 15:56             ` Thomas Huth
2019-07-23 12:57       ` Alex Bennée
2019-07-23 13:33     ` Peter Maydell
2019-07-23 13:47       ` Philippe Mathieu-Daudé

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190723103612.5600-17-alex.bennee@linaro.org \
    --to=alex.bennee@linaro.org \
    --cc=peter.maydell@linaro.org \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=sw@weilnetz.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).