diff options
| author |   Marcelo Tosatti <mtosatti@redhat.com> | 2010-12-02 11:51:26 -0200 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-12-02 11:51:26 -0200 |
| commit | f6f8864b9b3ae1ea151c2b781792a5e72baaa178 (patch) | |
| tree | 737905f20974e9e383631d19e5c8d734bba8381c /Makefile | |
| parent | device-assignment: Make use of config_map (diff) | |
| parent | Add new vgabios binaries to blobs list. (diff) | |
| download | qemu-kvm-f6f8864b9b3ae1ea151c2b781792a5e72baaa178.tar.gz qemu-kvm-f6f8864b9b3ae1ea151c2b781792a5e72baaa178.tar.bz2 qemu-kvm-f6f8864b9b3ae1ea151c2b781792a5e72baaa178.zip | |
Merge commit '3b3d448e01ccfc6fdcb6e3d4ebf47418075e3bb4' into upstream-merge
* commit '3b3d448e01ccfc6fdcb6e3d4ebf47418075e3bb4':
Add new vgabios binaries to blobs list.
Conflicts:
pc-bios/vgabios-cirrus.bin
pc-bios/vgabios.bin
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -178,8 +178,9 @@ ar de en-us fi fr-be hr it lv nl pl ru th \ common de-ch es fo fr-ca hu ja mk nl-be pt sl tr ifdef INSTALL_BLOBS -BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin ppc_rom.bin \ -openbios-sparc32 openbios-sparc64 openbios-ppc \ +BLOBS=bios.bin vgabios.bin vgabios-cirrus.bin \ +vgabios-stdvga.bin vgabios-vmware.bin \ +ppc_rom.bin openbios-sparc32 openbios-sparc64 openbios-ppc \ gpxe-eepro100-80861209.rom \ gpxe-eepro100-80861229.rom \ pxe-e1000.bin \ |