From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZG6lt-0000S1-Fq for qemu-devel@nongnu.org; Fri, 17 Jul 2015 10:37:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZG6ll-0003Nf-0m for qemu-devel@nongnu.org; Fri, 17 Jul 2015 10:37:48 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35301) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZG6lk-0003NU-SP for qemu-devel@nongnu.org; Fri, 17 Jul 2015 10:37:44 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 81784BC8DA for ; Fri, 17 Jul 2015 14:37:44 +0000 (UTC) From: Gerd Hoffmann Date: Fri, 17 Jul 2015 16:37:33 +0200 Message-Id: <1437143854-2826-7-git-send-email-kraxel@redhat.com> In-Reply-To: <1437143854-2826-1-git-send-email-kraxel@redhat.com> References: <1437143854-2826-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL 6/7] ipxe: don't override GITVERSION List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 [ most likely ipxe commit 6153c09c41034250408f3596555fcaae715da46c: [build] Set GITVERSION only if there is a git repository ] Reviewed-by: Laszlo Ersek --- 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