[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 8/9] roms: enable parallel seabios / seavgabios buil
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 8/9] roms: enable parallel seabios / seavgabios builds |
Date: |
Mon, 30 Sep 2013 11:12:57 +0200 |
Signed-off-by: Gerd Hoffmann <address@hidden>
---
roms/Makefile | 29 ++++++++++++++++++---------
roms/{config.vga.cirrus => config.vga-cirrus} | 0
roms/{config.vga.isavga => config.vga-isavga} | 0
roms/{config.vga.qxl => config.vga-qxl} | 0
roms/{config.vga.stdvga => config.vga-stdvga} | 0
roms/{config.vga.vmware => config.vga-vmware} | 0
6 files changed, 19 insertions(+), 10 deletions(-)
rename roms/{config.vga.cirrus => config.vga-cirrus} (100%)
rename roms/{config.vga.isavga => config.vga-isavga} (100%)
rename roms/{config.vga.qxl => config.vga-qxl} (100%)
rename roms/{config.vga.stdvga => config.vga-stdvga} (100%)
rename roms/{config.vga.vmware => config.vga-vmware} (100%)
diff --git a/roms/Makefile b/roms/Makefile
index 1966f04..6994873 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -55,18 +55,27 @@ default:
@echo " the EfiRom utility from edk2 / tianocore)"
@echo " slof -- update slof.bin"
-bios: config.seabios
- sh configure-seabios.sh $<
- make -C seabios out/bios.bin
- cp seabios/out/bios.bin ../pc-bios/bios.bin
- cp seabios/out/*dsdt.aml ../pc-bios/
+bios: build-seabios-config-seabios
+ cp seabios/builds/seabios/bios.bin ../pc-bios/bios.bin
+ cp seabios/builds/seabios/*dsdt.aml ../pc-bios/
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
+seavgabios-isavga: build-seabios-config-vga-isavga
+ cp seabios/builds/vga-isavga/vgabios.bin ../pc-bios/vgabios.bin
+
+seavgabios-%: build-seabios-config-vga-%
+ cp seabios/builds/vga-$*/vgabios.bin ../pc-bios/vgabios-$*.bin
+
+build-seabios-config-%: config.%
+ mkdir -p seabios/builds/$*
+ cp $< seabios/builds/$*/.config
+ $(MAKE) $(MAKEFLAGS) -C seabios \
+ KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \
+ OUT=$(CURDIR)/seabios/builds/$*/ oldnoconfig
+ $(MAKE) $(MAKEFLAGS) -C seabios \
+ KCONFIG_CONFIG=$(CURDIR)/seabios/builds/$*/.config \
+ OUT=$(CURDIR)/seabios/builds/$*/ all
lgplvgabios: $(patsubst %,lgplvgabios-%,$(vgabios_variants))
@@ -115,7 +124,7 @@ slof:
clean:
- rm -rf seabios/.config seabios/out
+ rm -rf seabios/.config seabios/out seabios/builds
$(MAKE) $(MAKEFLAGS) -C vgabios clean
rm -f vgabios/VGABIOS-lgpl-latest*
$(MAKE) $(MAKEFLAGS) -C ipxe/src veryclean
diff --git a/roms/config.vga.cirrus b/roms/config.vga-cirrus
similarity index 100%
rename from roms/config.vga.cirrus
rename to roms/config.vga-cirrus
diff --git a/roms/config.vga.isavga b/roms/config.vga-isavga
similarity index 100%
rename from roms/config.vga.isavga
rename to roms/config.vga-isavga
diff --git a/roms/config.vga.qxl b/roms/config.vga-qxl
similarity index 100%
rename from roms/config.vga.qxl
rename to roms/config.vga-qxl
diff --git a/roms/config.vga.stdvga b/roms/config.vga-stdvga
similarity index 100%
rename from roms/config.vga.stdvga
rename to roms/config.vga-stdvga
diff --git a/roms/config.vga.vmware b/roms/config.vga-vmware
similarity index 100%
rename from roms/config.vga.vmware
rename to roms/config.vga-vmware
--
1.8.3.1
- [Qemu-devel] [PULL 0/9] roms: various build improvements, Gerd Hoffmann, 2013/09/30
- [Qemu-devel] [PATCH 5/9] roms: rewrite scripts/refresh-pxe-roms.sh, Gerd Hoffmann, 2013/09/30
- [Qemu-devel] [PATCH 8/9] roms: enable parallel seabios / seavgabios builds,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 4/9] roms: parallel ipxe builds, Gerd Hoffmann, 2013/09/30
- [Qemu-devel] [PATCH 6/9] roms: add rules to build slof, Gerd Hoffmann, 2013/09/30
- [Qemu-devel] [PATCH 7/9] roms: enable ipxe cross builds, Gerd Hoffmann, 2013/09/30
- [Qemu-devel] [PATCH 9/9] roms: add support for building sgabios, Gerd Hoffmann, 2013/09/30
- [Qemu-devel] [PATCH 1/9] roms: add 'make clean', Gerd Hoffmann, 2013/09/30
- [Qemu-devel] [PATCH 3/9] roms: build lgplvgabios isavga variant, Gerd Hoffmann, 2013/09/30
- [Qemu-devel] [PATCH 2/9] roms: enable parallel builds for 'make lgplvgabios', Gerd Hoffmann, 2013/09/30