[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 6/7] ipxe: don't override GITVERSION
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 6/7] ipxe: don't override GITVERSION |
Date: |
Fri, 17 Jul 2015 16:37:33 +0200 |
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 <address@hidden>
[ most likely ipxe commit 6153c09c41034250408f3596555fcaae715da46c:
[build] Set GITVERSION only if there is a git repository ]
Reviewed-by: Laszlo Ersek <address@hidden>
---
roms/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/roms/Makefile b/roms/Makefile
index 4971f6b..55fc45b 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
ipxe/src/config/local/branding.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
ipxe/src/config/local/branding.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))
--
1.8.3.1
- [Qemu-devel] [PULL for-2.4 0/7] update ipxe roms, fix efi support, Gerd Hoffmann, 2015/07/17
- [Qemu-devel] [PULL 4/7] ipxe: disable load file protocol, Gerd Hoffmann, 2015/07/17
- [Qemu-devel] [PULL 7/7] ipxe: update binaries, Gerd Hoffmann, 2015/07/17
- [Qemu-devel] [PULL 3/7] ipxe: rm local config in cleanup, Gerd Hoffmann, 2015/07/17
- [Qemu-devel] [PULL 6/7] ipxe: don't override GITVERSION,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 2/7] ipxe: update to 87981bb (qemu), Gerd Hoffmann, 2015/07/17
- [Qemu-devel] [PULL 5/7] ipxe: add qemu branding, Gerd Hoffmann, 2015/07/17
- [Qemu-devel] [PULL 1/7] ipxe: update from 35c53797 to 24112d9 (upstream/master), Gerd Hoffmann, 2015/07/17
- Re: [Qemu-devel] [PULL for-2.4 0/7] update ipxe roms, fix efi support, Peter Maydell, 2015/07/20
- Re: [Qemu-devel] [PULL for-2.4 0/7] update ipxe roms, fix efi support, Peter Maydell, 2015/07/21
- Re: [Qemu-devel] [PULL for-2.4 0/7] update ipxe roms, fix efi support, Paolo Bonzini, 2015/07/21
- Re: [Qemu-devel] [PULL for-2.4 0/7] update ipxe roms, fix efi support, Peter Maydell, 2015/07/21
- Re: [Qemu-devel] [PULL for-2.4 0/7] update ipxe roms, fix efi support, Paolo Bonzini, 2015/07/21
- Re: [Qemu-devel] [PULL for-2.4 0/7] update ipxe roms, fix efi support, Peter Maydell, 2015/07/21
- Re: [Qemu-devel] [PULL for-2.4 0/7] update ipxe roms, fix efi support, Paolo Bonzini, 2015/07/21