From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47006) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VMlxE-0006EL-BN for qemu-devel@nongnu.org; Thu, 19 Sep 2013 17:40:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VMlx6-00027T-CT for qemu-devel@nongnu.org; Thu, 19 Sep 2013 17:40:03 -0400 Received: from [137.65.135.21] (port=53288 helo=suse.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VMlx6-00027B-6q for qemu-devel@nongnu.org; Thu, 19 Sep 2013 17:39:56 -0400 From: Bruce Rogers Date: Thu, 19 Sep 2013 15:00:35 -0600 Message-Id: <1379624436-22845-3-git-send-email-brogers@suse.com> In-Reply-To: <1379624436-22845-1-git-send-email-brogers@suse.com> References: <1379624436-22845-1-git-send-email-brogers@suse.com> Subject: [Qemu-devel] [PATCH 2/3] roms: make and install isa vgabios binary List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, kraxel@redhat.com Cc: Bruce Rogers Add the isa vgabios binary to the list of vgabios binaries we make and install to pc-bios. Do this for both to the seabios as well as the lgpl based vgabios source trees. Signed-off-by: Bruce Rogers --- roms/Makefile | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/roms/Makefile b/roms/Makefile index 6de9424..16fb8ac 100644 --- a/roms/Makefile +++ b/roms/Makefile @@ -1,5 +1,5 @@ -vgabios_variants := stdvga cirrus vmware qxl +vgabios_variants := stdvga cirrus vmware qxl isavga pxerom_variants := e1000 eepro100 ne2k_pci pcnet rtl8139 virtio pxe-rom-e1000 efi-rom-e1000 : VID := 8086 @@ -47,13 +47,22 @@ seavgabios: $(patsubst %,seavgabios-%,$(vgabios_variants)) seavgabios-%: config.vga.% sh configure-seabios.sh $< $(MAKE) -C seabios out/vgabios.bin - cp seabios/out/vgabios.bin ../pc-bios/vgabios-$*.bin + @if [ "$*" = "isavga" ]; then \ + cp seabios/out/vgabios.bin ../pc-bios/vgabios.bin; \ + else \ + cp seabios/out/vgabios.bin ../pc-bios/vgabios-$*.bin; \ + fi lgplvgabios: $(patsubst %,lgplvgabios-%,$(vgabios_variants)) lgplvgabios-%: - $(MAKE) -C vgabios vgabios-$*.bin - cp vgabios/VGABIOS-lgpl-latest.$*.bin ../pc-bios/vgabios-$*.bin + @if [ "$*" = "isavga" ]; then \ + $(MAKE) -C vgabios vgabios.bin; \ + cp vgabios/VGABIOS-lgpl-latest.bin ../pc-bios/vgabios.bin; \ + else \ + $(MAKE) -C vgabios vgabios-$*.bin; \ + cp vgabios/VGABIOS-lgpl-latest.$*.bin ../pc-bios/vgabios-$*.bin; \ + fi pxerom: $(patsubst %,pxe-rom-%,$(pxerom_variants)) -- 1.7.7