qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Laszlo Ersek <lersek@redhat.com>
To: Gerd Hoffmann <kraxel@redhat.com>, qemu-devel@nongnu.org
Subject: Re: [Qemu-devel] [PATCH 6/7] ipxe: don't override GITVERSION
Date: Wed, 15 Jul 2015 13:06:25 +0200	[thread overview]
Message-ID: <55A63EB1.4040800@redhat.com> (raw)
In-Reply-To: <1436955007-8216-7-git-send-email-kraxel@redhat.com>

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>

  reply	other threads:[~2015-07-15 11:06 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-15 10:10 [Qemu-devel] [PATCH 0/7] ipxe update, continued Gerd Hoffmann
2015-07-15 10:10 ` [Qemu-devel] [PATCH 1/7] ipxe: update from 35c53797 to 24112d9 (upstream/master) Gerd Hoffmann
2015-07-15 10:51   ` Laszlo Ersek
2015-07-15 10:10 ` [Qemu-devel] [PATCH 2/7] ipxe: update to 87981bb (qemu) Gerd Hoffmann
2015-07-15 10:57   ` Laszlo Ersek
2015-07-15 10:10 ` [Qemu-devel] [PATCH 3/7] ipxe: rm local config in cleanup Gerd Hoffmann
2015-07-15 10:58   ` Laszlo Ersek
2015-07-15 10:10 ` [Qemu-devel] [PATCH 4/7] ipxe: disable load file protocol Gerd Hoffmann
2015-07-15 11:01   ` Laszlo Ersek
2015-07-15 10:10 ` [Qemu-devel] [PATCH 5/7] ipxe: add qemu branding Gerd Hoffmann
2015-07-15 11:02   ` Laszlo Ersek
2015-07-15 10:10 ` [Qemu-devel] [PATCH 6/7] ipxe: don't override GITVERSION Gerd Hoffmann
2015-07-15 11:06   ` Laszlo Ersek [this message]
2015-07-15 10:10 ` [Qemu-devel] [PATCH 7/7] ipxe: update binaries Gerd Hoffmann
2015-07-15 11:10   ` Laszlo Ersek
2015-07-15 12:01     ` Gerd Hoffmann
2015-07-15 12:58       ` Laszlo Ersek
2015-07-15 10:47 ` [Qemu-devel] [PATCH 0/7] ipxe update, continued Laszlo Ersek
2015-07-15 11:13 ` Laszlo Ersek
2015-07-16 15:22 ` Gerd Hoffmann
  -- strict thread matches above, loose matches on Subject: below --
2015-04-10 14:17 [Qemu-devel] [PATCH 0/7] ipxe: update pxe boot roms for qemu Gerd Hoffmann
2015-04-10 14:17 ` [Qemu-devel] [PATCH 6/7] ipxe: don't override GITVERSION Gerd Hoffmann

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=55A63EB1.4040800@redhat.com \
    --to=lersek@redhat.com \
    --cc=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).