From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:58837)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lersek@redhat.com>) id 1ZFKWF-0005xE-HH
	for qemu-devel@nongnu.org; Wed, 15 Jul 2015 07:06:32 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <lersek@redhat.com>) id 1ZFKWC-0002j3-CN
	for qemu-devel@nongnu.org; Wed, 15 Jul 2015 07:06:31 -0400
Received: from mx1.redhat.com ([209.132.183.28]:42840)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <lersek@redhat.com>) id 1ZFKWC-0002ir-8D
	for qemu-devel@nongnu.org; Wed, 15 Jul 2015 07:06:28 -0400
Received: from int-mx09.intmail.prod.int.phx2.redhat.com
	(int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22])
	by mx1.redhat.com (Postfix) with ESMTPS id B63C3A0CA4
	for <qemu-devel@nongnu.org>; Wed, 15 Jul 2015 11:06:27 +0000 (UTC)
Message-ID: <55A63EB1.4040800@redhat.com>
Date: Wed, 15 Jul 2015 13:06:25 +0200
From: Laszlo Ersek <lersek@redhat.com>
MIME-Version: 1.0
References: <1436955007-8216-1-git-send-email-kraxel@redhat.com>
	<1436955007-8216-7-git-send-email-kraxel@redhat.com>
In-Reply-To: <1436955007-8216-7-git-send-email-kraxel@redhat.com>
Content-Type: text/plain; charset=windows-1252
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH 6/7] ipxe: don't override GITVERSION
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Gerd Hoffmann <kraxel@redhat.com>, qemu-devel@nongnu.org

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 <kraxel@redhat.com>
> ---
>  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 <flo@geekplace.eu>
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 <lersek@redhat.com>