Updates the gnu-efi submodule to the latest version (f64cef26) Changes to the gnu-efi makefiles require changes to the syslinux build scripts. Mainly, the install targets dropped the $(SRCDIR) prefix, e.g. - $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)/$(LIBDIR) + $(INSTALL) -m 644 elf_$(ARCH)_efi.lds $(INSTALLROOT)/$(LIBDIR) Since syslinux cd's to $(objdir) before building gnu-efi, make install fails with file not found errors. This patch changes the build scripts to cd to the gnu-efi directory before building. One side effect of this is that 'make spotless' from the syslinux root directory no longer triggers a rebuild of gnu-efi. 'make clean' still does, though. Tested on top of commit aee0dc5565711ef5be7c30fb5fc1c5f3f98db09f Jonathan Boeing (1): gnu-efi: update to f64cef26 efi/build-gnu-efi.sh | 8 ++++---- efi/clean-gnu-efi.sh | 6 +++--- gnu-efi | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) -- 2.3.0
Signed-off-by: Jonathan Boeing <jonathan.n.boeing at gmail.com> --- efi/build-gnu-efi.sh | 8 ++++---- efi/clean-gnu-efi.sh | 6 +++--- gnu-efi | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/efi/build-gnu-efi.sh b/efi/build-gnu-efi.sh index e72d872..e2f9d3d 100755 --- a/efi/build-gnu-efi.sh +++ b/efi/build-gnu-efi.sh @@ -35,11 +35,11 @@ fi ) mkdir -p "$objdir/gnu-efi" -cd "$objdir/gnu-efi" -EFIDIR="$(readlink -f "$objdir/../gnu-efi/gnu-efi-3.0")" +EFIDIR="$(readlink -f "$objdir/../gnu-efi")" +cd "$EFIDIR" -make SRCDIR="$EFIDIR" TOPDIR="$EFIDIR" -f "$EFIDIR/Makefile" ARCH=$ARCH -make SRCDIR="$EFIDIR" TOPDIR="$EFIDIR" -f "$EFIDIR/Makefile" ARCH=$ARCH PREFIX="$objdir" install +make -f "$EFIDIR/Makefile" ARCH=$ARCH INSTALLROOT="$objdir" PREFIX="" +make -f "$EFIDIR/Makefile" ARCH=$ARCH INSTALLROOT="$objdir" PREFIX="" install cd "$objdir/efi" diff --git a/efi/clean-gnu-efi.sh b/efi/clean-gnu-efi.sh index 58def28..849dddc 100755 --- a/efi/clean-gnu-efi.sh +++ b/efi/clean-gnu-efi.sh @@ -29,9 +29,9 @@ objdir=$(readlink -f "$2") ) if [ -d "$objdir/gnu-efi" ];then - cd "$objdir/gnu-efi" - EFIDIR="$(readlink -f "$objdir/../gnu-efi/gnu-efi-3.0")" - make SRCDIR="$EFIDIR" TOPDIR="$EFIDIR" -f "$EFIDIR/Makefile" ARCH=$ARCH clean + EFIDIR="$(readlink -f "$objdir/../gnu-efi")" + cd "$EFIDIR" + make -f "$EFIDIR/Makefile" ARCH=$ARCH clean fi cd "$objdir/efi" diff --git a/gnu-efi b/gnu-efi index ab54e2b..f64cef2 160000 --- a/gnu-efi +++ b/gnu-efi @@ -1 +1 @@ -Subproject commit ab54e2b40e914d0ca01dc3d44c8d4eb8517bf999 +Subproject commit f64cef26270bfbe04f038da33f95ae3f14c071bc -- 2.3.0
Please disregard this patch; it's not safe for parallel building. I'm working on an update. Regards, Jonathan Boeing
On Wed, Feb 11, 2015 at 02:02:30PM -0700, Jonathan Boeing via Syslinux wrote:> Please disregard this patch; it's not safe for parallel building. I'm > working on an update.Thanks for the heads up. Groeten Geert Stappers -- Leven en laten leven
On Feb 11, 2015 4:09 PM, "Jonathan Boeing via Syslinux" <syslinux at zytor.com> wrote:> > Please disregard this patch; it's not safe for parallel building. I'm > working on an update.I had to patch gnu-efi to get this working. --Gene