Skip to contentSkip to conversation

NSIS: Add missing firmware blobs

PATCH In review Philippe Mathieu-Daudé 2 participants 2 messages Jul 23, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 NSIS: Add missing firmware blobs

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.

---
v2: Add *.ndrv, update the Uninstall section (Stefan)

---
 qemu.nsi | 11 +++++++++++
 1 file changed, 11 insertions(+)
qemu.nsi +11 -0
index 75f1608b9e..d0df0f4e3a 100644
@@ -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"
Signature · 1 line
2.20.1
#1 lore raw
Quoted 11 lines · 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.

Queued to testing/next, thanks.

Quoted 32 lines

---
v2: Add *.ndrv, update the Uninstall section (Stefan)

---
 qemu.nsi | 11 +++++++++++
 1 file changed, 11 insertions(+)
qemu.nsi +7 -0
index 75f1608b9e..d0df0f4e3a 100644
@@ -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-*"
 

qemu.nsi Section "Uninstall" · line 226

Quoted 10 lines
qemu.nsi +4 -0
@@ -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