qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: Gerd Hoffmann <kraxel@redhat.com>
Subject: [Qemu-devel] [PULL 6/7] ipxe: don't override GITVERSION
Date: Fri, 17 Jul 2015 16:37:33 +0200	[thread overview]
Message-ID: <1437143854-2826-7-git-send-email-kraxel@redhat.com> (raw)
In-Reply-To: <1437143854-2826-1-git-send-email-kraxel@redhat.com>

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>

[ most likely ipxe commit 6153c09c41034250408f3596555fcaae715da46c:
  [build] Set GITVERSION only if there is a git repository ]

Reviewed-by: Laszlo Ersek <lersek@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))
-- 
1.8.3.1

  parent reply	other threads:[~2015-07-17 14:37 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-17 14:37 [Qemu-devel] [PULL for-2.4 0/7] update ipxe roms, fix efi support Gerd Hoffmann
2015-07-17 14:37 ` [Qemu-devel] [PULL 1/7] ipxe: update from 35c53797 to 24112d9 (upstream/master) Gerd Hoffmann
2015-07-17 14:37 ` [Qemu-devel] [PULL 2/7] ipxe: update to 87981bb (qemu) Gerd Hoffmann
2015-07-17 14:37 ` [Qemu-devel] [PULL 3/7] ipxe: rm local config in cleanup Gerd Hoffmann
2015-07-17 14:37 ` [Qemu-devel] [PULL 4/7] ipxe: disable load file protocol Gerd Hoffmann
2015-07-17 14:37 ` [Qemu-devel] [PULL 5/7] ipxe: add qemu branding Gerd Hoffmann
2015-07-17 14:37 ` Gerd Hoffmann [this message]
2015-07-17 14:37 ` [Qemu-devel] [PULL 7/7] ipxe: update binaries Gerd Hoffmann
2015-07-20 10:04 ` [Qemu-devel] [PULL for-2.4 0/7] update ipxe roms, fix efi support Peter Maydell
2015-07-21  8:21   ` Peter Maydell
2015-07-21  8:51     ` Paolo Bonzini
2015-07-21 13:27       ` Peter Maydell
2015-07-21 13:47         ` Paolo Bonzini
2015-07-21 13:57           ` Peter Maydell
2015-07-21 14:09             ` Paolo Bonzini
2015-07-21 14:25               ` Peter Maydell
2015-07-21 14:28                 ` Paolo Bonzini
2015-07-21 16:10                   ` Stefan Hajnoczi
2015-07-21 16:18                     ` Peter Maydell
2015-07-21 23:00                       ` Laszlo Ersek
2015-07-21 22:58                     ` Laszlo Ersek
2015-07-21 23:22                       ` Laszlo Ersek
2015-07-22  9:05                       ` Stefan Hajnoczi
2015-07-22 10:05                         ` Laszlo Ersek
2015-07-22 11:42                           ` Stefan Hajnoczi
2015-07-22 20:08                             ` Laszlo Ersek
2015-07-23  8:26                               ` Stefan Hajnoczi
2015-07-22 20:06                       ` Michael Brown
2015-07-22 20:10                         ` Laszlo Ersek

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1437143854-2826-7-git-send-email-kraxel@redhat.com \
    --to=kraxel@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).