Skip to contentSkip to conversation

syslinux: Drop patch 0003, not needed after gnu-efi update

PATCH New Benoît Allard 3 participants 3 messages Jul 3, 2017 – Aug 13, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 syslinux: Drop patch 0003, not needed after gnu-efi update

---
 ....elf-Not-enough-room-for-program-headers-.patch | 35 ----------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 boot/syslinux/0003-Fix-ldlinux.elf-Not-enough-room-for-program-headers-.patch
boot/syslinux/0003-Fix-ldlinux.elf-Not-enough-room-for-program-headers-.patch deleted +0 -35
deleted file mode 100644
index 83a87ee..0000000
@@ -1,35 +0,0 @@
-From 61de7762389d460da7ffdd644f50c60175cce23b Mon Sep 17 00:00:00 2001
-From: Steve McIntyre <[email protected]>
-Date: Wed, 5 Apr 2017 22:09:37 +0200
-Subject: [PATCH] Fix 'ldlinux.elf: Not enough room for program headers, try
- linking with -N'
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix for https://bugs.debian.org/846679: syslinux: FTBFS: ld:
-ldlinux.elf: Not enough room for program headers, try linking with -N
-
-https://bugs.debian.org/cgi-bin/bugreport.cgi?att=1;bug=846679;filename=syslinux_6.03%2Bdfsg-14.1.debdiff;msg=10
-
-Signed-off-by: Beno?t Allard <[email protected]>
----
- core/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/core/Makefile b/core/Makefile
-index ad0acb5..58a3545 100644
---- a/core/Makefile
-+++ b/core/Makefile
-@@ -165,7 +165,7 @@ LDSCRIPT = $(SRC)/$(ARCH)/syslinux.ld
- 
- %.elf: %.o $(LIBDEP) $(LDSCRIPT) $(AUXLIBS)
- 	$(LD) $(LDFLAGS) -Bsymbolic $(LD_PIE) -E --hash-style=gnu -T $(LDSCRIPT) -M -o $@ $< \
--		--start-group $(LIBS) $(subst $(*F).elf,lib$(*F).a,$@) --end-group \
-+		--start-group $(LIBS) $(subst $(*F).elf,lib$(*F).a,$@) --end-group --no-dynamic-linker \
- 		> $(@:.elf=.map)
- 	$(OBJDUMP) -h $@ > $(@:.elf=.sec)
- 	$(PERL) $(SRC)/lstadjust.pl $(@:.elf=.lsr) $(@:.elf=.sec) $(@:.elf=.lst)
--- 
-2.7.4
-
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 syslinux: Drop patch 0003, not needed after gnu-efi update

Hello,

Quoted 5 lines · Beno?t Allard
---
 ....elf-Not-enough-room-for-program-headers-.patch | 35 ----------------------
 1 file changed, 35 deletions(-)
 delete mode 100644 boot/syslinux/0003-Fix-ldlinux.elf-Not-enough-room-for-program-headers-.patch

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 syslinux: Drop patch 0003, not needed after gnu-efi update

In reply to Benoît Allard

Hi Benoit,

Quoted 1 line · Beno?t Allard

Is this patch really not needed anymore after the gnu-efi update? Isn't it
still needed for BIOS (and perhaps others as well, e.g. isolinux)? I'm looking at the build failure of ts5x00_defconfig and it seems to point at this issue. And indeed, reinstating this patch fixes the build failure.

[snip]

boot/syslinux/0003-Fix-ldlinux.elf-Not-enough-room-for-program-headers-.patch line 11

Quoted 2 lines
boot/syslinux/0003-Fix-ldlinux.elf-Not-enough-room-for-program-headers-.patch deleted +0 -2
-Fix for https://bugs.debian.org/846679: syslinux: FTBFS: ld:
-ldlinux.elf: Not enough room for program headers, try linking with -N

This is exactly the error we see.

I sent a patch to revert this, could you check it?

Regards,
Arnout

[1] https://gitlab.com/arnout/buildroot/-/jobs/28979377

[snip]

Signature · 6 lines
Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF