| Message ID | 20190717134335.15351-17-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | testing/next for 4.1-rc2 (win, travis, iotests) | expand |
On 7/17/19 3:43 PM, Alex Bennée wrote: > 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. > This one has: Acked-by: Laszlo Ersek <lersek@redhat.com> https://lists.gnu.org/archive/html/qemu-devel/2019-07/msg03594.html > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Message-Id: <20190715174817.18981-10-philmd@redhat.com> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > qemu.nsi | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/qemu.nsi b/qemu.nsi > index 75f1608b9e0..89c7c04f957 100644 > --- a/qemu.nsi > +++ b/qemu.nsi > @@ -122,6 +122,9 @@ Section "${PRODUCT} (required)" > File "${BINDIR}\*.bmp" > File "${BINDIR}\*.bin" > File "${BINDIR}\*.dtb" > + File "${BINDIR}\*.fd" > + File "${BINDIR}\*.img" > + File "${BINDIR}\*.lid" > File "${BINDIR}\*.rom" > File "${BINDIR}\openbios-*" > >
Am 17.07.2019 um 15:43 schrieb Alex Bennée: > 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. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> > Message-Id: <20190715174817.18981-10-philmd@redhat.com> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > qemu.nsi | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/qemu.nsi b/qemu.nsi > index 75f1608b9e0..89c7c04f957 100644 > --- a/qemu.nsi > +++ b/qemu.nsi > @@ -122,6 +122,9 @@ Section "${PRODUCT} (required)" > File "${BINDIR}\*.bmp" > File "${BINDIR}\*.bin" > File "${BINDIR}\*.dtb" > + File "${BINDIR}\*.fd" > + File "${BINDIR}\*.img" > + File "${BINDIR}\*.lid" > File "${BINDIR}\*.rom" > File "${BINDIR}\openbios-*" > Hi, what about qemu_vga.ndrv? And all new file pattern should also be added to the uninstall section. Regards, Stefan
On 7/17/19 8:23 PM, Stefan Weil wrote: > Am 17.07.2019 um 15:43 schrieb Alex Bennée: >> 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. >> >> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> >> Message-Id: <20190715174817.18981-10-philmd@redhat.com> >> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >> --- >> qemu.nsi | 3 +++ >> 1 file changed, 3 insertions(+) >> >> diff --git a/qemu.nsi b/qemu.nsi >> index 75f1608b9e0..89c7c04f957 100644 >> --- a/qemu.nsi >> +++ b/qemu.nsi >> @@ -122,6 +122,9 @@ Section "${PRODUCT} (required)" >> File "${BINDIR}\*.bmp" >> File "${BINDIR}\*.bin" >> File "${BINDIR}\*.dtb" >> + File "${BINDIR}\*.fd" >> + File "${BINDIR}\*.img" >> + File "${BINDIR}\*.lid" >> File "${BINDIR}\*.rom" >> File "${BINDIR}\openbios-*" >> > > > Hi, > > what about qemu_vga.ndrv? And all new file pattern should also be added > to the uninstall section. Good point. Alex, so you mind amending: + File "${BINDIR}\*.ndrv" Stefan is that OK if we fix the uninstall section for the next rc or release? Else, Alex please drop this patch.
Am 22.07.2019 um 22:06 schrieb Philippe Mathieu-Daudé: > On 7/17/19 8:23 PM, Stefan Weil wrote: >> Am 17.07.2019 um 15:43 schrieb Alex Bennée: >>> 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. >>> >>> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> >>> Message-Id: <20190715174817.18981-10-philmd@redhat.com> >>> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >>> --- >>> qemu.nsi | 3 +++ >>> 1 file changed, 3 insertions(+) >>> >>> diff --git a/qemu.nsi b/qemu.nsi >>> index 75f1608b9e0..89c7c04f957 100644 >>> --- a/qemu.nsi >>> +++ b/qemu.nsi >>> @@ -122,6 +122,9 @@ Section "${PRODUCT} (required)" >>> File "${BINDIR}\*.bmp" >>> File "${BINDIR}\*.bin" >>> File "${BINDIR}\*.dtb" >>> + File "${BINDIR}\*.fd" >>> + File "${BINDIR}\*.img" >>> + File "${BINDIR}\*.lid" >>> File "${BINDIR}\*.rom" >>> File "${BINDIR}\openbios-*" >>> >> >> Hi, >> >> what about qemu_vga.ndrv? And all new file pattern should also be added >> to the uninstall section. > Good point. > > Alex, so you mind amending: > > + File "${BINDIR}\*.ndrv" > > Stefan is that OK if we fix the uninstall section for the next rc or > release? > > Else, Alex please drop this patch. Sure, we can improve the NSIS script in several steps and fix the uninstall later. You may add a Reviewed-by: Stefan Weil <sw@weilnetz.de> Thanks, Stefan
diff --git a/qemu.nsi b/qemu.nsi index 75f1608b9e0..89c7c04f957 100644 --- a/qemu.nsi +++ b/qemu.nsi @@ -122,6 +122,9 @@ Section "${PRODUCT} (required)" File "${BINDIR}\*.bmp" File "${BINDIR}\*.bin" File "${BINDIR}\*.dtb" + File "${BINDIR}\*.fd" + File "${BINDIR}\*.img" + File "${BINDIR}\*.lid" File "${BINDIR}\*.rom" File "${BINDIR}\openbios-*"