Re: [Qemu-devel] [PATCH 6/7] ipxe: don't override GITVERSION

[Laszlo Ersek]

On 07/15/15 12:10, Gerd Hoffmann wrote:
> 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>
> ---
>  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))
> 

Probably fixed in:

commit 6153c09c41034250408f3596555fcaae715da46c
Author: Florian Schmaus <address@hidden>
Date:   Mon Jul 28 16:47:48 2014 +0100

    [build] Set GITVERSION only if there is a git repository

(This ipxe commit precedes 35c5379760aa1fea5e38f7a78b090f92bb7813ee,
*from* which patch 1/7 updates the submodule, ie. we could have probably
removed the workaround earlier, but it's fine now too.)

Reviewed-by: Laszlo Ersek <address@hidden>