[syslinux:firmware] efi: install ldlinux.{e32,e64}

syslinux-bot for Matt Fleming matt.fleming at intel.com
Thu Jun 20 06:51:05 PDT 2013


Commit-ID:  32b98b8235bd3a4724ebdf9b475cd6c3ae3ce4c4
Gitweb:     http://www.syslinux.org/commit/32b98b8235bd3a4724ebdf9b475cd6c3ae3ce4c4
Author:     Matt Fleming <matt.fleming at intel.com>
AuthorDate: Tue, 11 Jun 2013 14:03:31 +0100
Committer:  Matt Fleming <matt.fleming at intel.com>
CommitDate: Tue, 11 Jun 2013 14:03:31 +0100

efi: install ldlinux.{e32,e64}

We need to install the corresonding ldlinux.* file for each of the
firmware.

Signed-off-by: Matt Fleming <matt.fleming at intel.com>

---
 Makefile     | 9 +++++----
 efi/Makefile | 3 +--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 115ed8f..3861168 100644
--- a/Makefile
+++ b/Makefile
@@ -329,12 +329,13 @@ install: local-install
 		-f $(SRC)/$$i/Makefile $@; done
 else
 install:
+	mkdir -m 755 -p $(INSTALLROOT)$(AUXDIR)/efi$(BITS)
 	set -e ; for i in $(INSTALLSUBDIRS) ; \
 		do $(MAKE) -C $$i SRC="$(SRC)/$$i" OBJ="$(OBJ)/$$i" \
-		BITS="$(BITS)" -f $(SRC)/$$i/Makefile $@; done
-
-	mkdir -m 755 -p $(INSTALLROOT)$(AUXDIR)/efi$(BITS)
-	install -m 755 $(MODULES) $(INSTALLROOT)$(AUXDIR)/efi$(BITS)
+		BITS="$(BITS)" AUXDIR="$(AUXDIR)/efi$(BITS)" \
+		-f $(SRC)/$$i/Makefile $@; done
+	-install -m 644 $(INSTALLABLE_MODULES) $(INSTALLROOT)$(AUXDIR)/efi$(BITS)
+	install -m 644 com32/elflink/ldlinux/$(LDLINUX) $(INSTALLROOT)$(AUXDIR)/efi$(BITS)
 endif
 
 netinstall: installer
diff --git a/efi/Makefile b/efi/Makefile
index cb99f2a..2003430 100644
--- a/efi/Makefile
+++ b/efi/Makefile
@@ -69,8 +69,7 @@ codepage.o: ../codepage/cp865.cp
 installer: syslinux.efi
 
 install: all
-	mkdir -m 755 -p $(INSTALLROOT)$(AUXDIR)/efi$(BITS)
-	install -m 755 $(BTARGET) $(INSTALLROOT)$(AUXDIR)/efi$(BITS)
+	install -m 755 $(BTARGET) $(INSTALLROOT)$(AUXDIR)
 
 strip:
 


More information about the Syslinux-commits mailing list