Skip to content

Commit

Permalink
ipxe: don't override GITVERSION
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
kraxel committed Sep 3, 2015
1 parent d4517d1 commit f927f16
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions roms/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
$(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
$(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))
Expand Down

0 comments on commit f927f16

Please sign in to comment.