summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMarcelo Tosatti <mtosatti@redhat.com>2010-12-02 11:51:26 -0200
committerMarcelo Tosatti <mtosatti@redhat.com>2010-12-02 11:51:26 -0200
commitf6f8864b9b3ae1ea151c2b781792a5e72baaa178 (patch)
tree737905f20974e9e383631d19e5c8d734bba8381c /Makefile
parentbdce0cb95bc07c2d0585210a4fe42f3c9c437a6b (diff)
parent3b3d448e01ccfc6fdcb6e3d4ebf47418075e3bb4 (diff)
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--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index fd8cb96e3..b66978ad5 100644
--- a/Makefile
+++ b/Makefile
@@ -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 \