aboutsummaryrefslogtreecommitdiff
path: root/roms
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2015-04-09 11:37:15 +0200
committerGerd Hoffmann <kraxel@redhat.com>2015-09-03 14:46:24 +0200
commitf927f16213506a493ac416d9a9fa73c7460a766e (patch)
tree541d062548fc342b60699f810ee6ffa743ad60d4 /roms
parentd4517d170c041ab654c9e65e5bbd3d79956af5b7 (diff)
downloadqemu-f927f16213506a493ac416d9a9fa73c7460a766e.zip
qemu-f927f16213506a493ac416d9a9fa73c7460a766e.tar.gz
qemu-f927f16213506a493ac416d9a9fa73c7460a766e.tar.bz2
ipxe: don't override GITVERSION
We had build problems due to the git version checking in the ipxe build system in the past. Don't remember the details, but the problem seems to be gone now, so lets remove the workaround. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> [ most likely ipxe commit 6153c09c41034250408f3596555fcaae715da46c: [build] Set GITVERSION only if there is a git repository ] Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Diffstat (limited to 'roms')
-rw-r--r--roms/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/roms/Makefile b/roms/Makefile
index 7b3f156..eb13836 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -121,12 +121,12 @@ efi-rom-%: build-pxe-roms build-efi-roms
-o ../pc-bios/efi-$*.rom
build-pxe-roms: ipxe/src/config/local/general.h
- $(MAKE) -C ipxe/src GITVERSION="" \
+ $(MAKE) -C ipxe/src \
CROSS_COMPILE=$(x86_64_cross_prefix) \
$(patsubst %,bin/%.rom,$(pxerom_targets))
build-efi-roms: build-pxe-roms ipxe/src/config/local/general.h
- $(MAKE) -C ipxe/src GITVERSION="" \
+ $(MAKE) -C ipxe/src \
CROSS_COMPILE=$(x86_64_cross_prefix) \
$(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \
$(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets))