qemu-devel
[Top][All Lists]
Advanced

[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




reply via email to

[Prev in Thread] Current Thread [Next in Thread]