Add bios-256k.bin to BLOBS on Makefile
diff mbox

Message ID 20131209233334.GC27737@otherpad.lan.raisama.net
State New
Headers show

Commit Message

Eduardo Habkost Dec. 9, 2013, 11:33 p.m. UTC
The default machine-type (pc-i440fx-2.0) now requires bios-256k.bin, but
"make install" isn't installing it, so qemu-system-x86_64 won't run out
of the box. Add it to BLOBS so it gets installed.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Gerd Hoffmann Dec. 10, 2013, 8:52 a.m. UTC | #1
On Mo, 2013-12-09 at 21:33 -0200, Eduardo Habkost wrote:
> The default machine-type (pc-i440fx-2.0) now requires bios-256k.bin, but
> "make install" isn't installing it, so qemu-system-x86_64 won't run out
> of the box. Add it to BLOBS so it gets installed.

Reviewed-by: Gerd Hoffmann <kraxel@redhat.com>

cheers,
  Gerd
Peter Maydell Dec. 10, 2013, 1:56 p.m. UTC | #2
On 9 December 2013 23:33, Eduardo Habkost <ehabkost@redhat.com> wrote:
> The default machine-type (pc-i440fx-2.0) now requires bios-256k.bin, but
> "make install" isn't installing it, so qemu-system-x86_64 won't run out
> of the box. Add it to BLOBS so it gets installed.
>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index bdff4e4..807054b 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -290,7 +290,7 @@ common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr \
>  bepo    cz
>
>  ifdef INSTALL_BLOBS
> -BLOBS=bios.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \
> +BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \
>  vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin \
>  acpi-dsdt.aml q35-acpi-dsdt.aml \
>  ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin \

Incidentally it's a bit bogus that we have to list all
these blob names both here and in configure (the latter
uses some wildcards but is still a kinda manual list)...

thanks
-- PMM
William Dauchy Dec. 11, 2013, 5:30 p.m. UTC | #3
On Tue, Dec 10, 2013 at 12:33 AM, Eduardo Habkost <ehabkost@redhat.com> wrote:
> The default machine-type (pc-i440fx-2.0) now requires bios-256k.bin, but
> "make install" isn't installing it, so qemu-system-x86_64 won't run out
> of the box. Add it to BLOBS so it gets installed.

it does fix my issue on my qemu-system-x86_64 test platform

Tested-by: William Dauchy <william@gandi.net>

Thanks,
Peter Maydell Jan. 6, 2014, 1:13 p.m. UTC | #4
Ping -- who's going to take this patch? Maybe it should
go via -trivial?

thanks
-- PMM

On 9 December 2013 23:33, Eduardo Habkost <ehabkost@redhat.com> wrote:
> The default machine-type (pc-i440fx-2.0) now requires bios-256k.bin, but
> "make install" isn't installing it, so qemu-system-x86_64 won't run out
> of the box. Add it to BLOBS so it gets installed.
>
> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
> ---
>  Makefile | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index bdff4e4..807054b 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -290,7 +290,7 @@ common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr \
>  bepo    cz
>
>  ifdef INSTALL_BLOBS
> -BLOBS=bios.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \
> +BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \
>  vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin \
>  acpi-dsdt.aml q35-acpi-dsdt.aml \
>  ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin \
> --
> 1.8.3.1
William Dauchy Jan. 14, 2014, 1:45 p.m. UTC | #5
On Mon, Jan 6, 2014 at 2:13 PM, Peter Maydell <peter.maydell@linaro.org> wrote:
> Ping -- who's going to take this patch? Maybe it should
> go via -trivial?

+1 still waiting for this merge
Michael Tokarev Jan. 14, 2014, 2:03 p.m. UTC | #6
14.01.2014 17:45, William Dauchy wrote:
> On Mon, Jan 6, 2014 at 2:13 PM, Peter Maydell <peter.maydell@linaro.org> wrote:
>> Ping -- who's going to take this patch? Maybe it should
>> go via -trivial?
> 
> +1 still waiting for this merge

Sorry guys, I was on a (relatively small) trip and weren't handling -trivial.
I'll pick it up for this week (there aren't many other changes in there).

Thanks,

/mjt

Patch
diff mbox

diff --git a/Makefile b/Makefile
index bdff4e4..807054b 100644
--- a/Makefile
+++ b/Makefile
@@ -290,7 +290,7 @@  common  de-ch  es     fo  fr-ca  hu     ja  mk  nl-be      pt  sl     tr \
 bepo    cz
 
 ifdef INSTALL_BLOBS
-BLOBS=bios.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \
+BLOBS=bios.bin bios-256k.bin sgabios.bin vgabios.bin vgabios-cirrus.bin \
 vgabios-stdvga.bin vgabios-vmware.bin vgabios-qxl.bin \
 acpi-dsdt.aml q35-acpi-dsdt.aml \
 ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc QEMU,tcx.bin \