diff mbox

Revert "syslinux: drop patch 0003, not needed after gnu-efi update"

Message ID 20170813232835.18414-1-arnout@mind.be
State Rejected
Headers show

Commit Message

Arnout Vandecappelle Aug. 13, 2017, 11:28 p.m. UTC
It turns out that this patch is still needed, since with some versions
of binutils the error still occurs.

Partially fixes: https://gitlab.com/arnout/buildroot/-/jobs/28979377

This reverts commit 644c024edeb7e20bd96ce4426aeca2cbcd74d9b9.

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Cc: Benoît Allard <benoit.allard@greenbone.net>
---
The failing ts5x00_defconfig also requires a kernel bump
---
 ....elf-Not-enough-room-for-program-headers-.patch | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 boot/syslinux/0003-Fix-ldlinux.elf-Not-enough-room-for-program-headers-.patch

Comments

Thomas Petazzoni Aug. 14, 2017, 8:09 p.m. UTC | #1
Hello,

On Mon, 14 Aug 2017 01:28:35 +0200, Arnout Vandecappelle
(Essensium/Mind) wrote:
> It turns out that this patch is still needed, since with some versions
> of binutils the error still occurs.
> 
> Partially fixes: https://gitlab.com/arnout/buildroot/-/jobs/28979377
> 
> This reverts commit 644c024edeb7e20bd96ce4426aeca2cbcd74d9b9.
> 
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> Cc: Benoît Allard <benoit.allard@greenbone.net>
> ---
> The failing ts5x00_defconfig also requires a kernel bump

The problem with this is that you are going to run into the problem I
reported at:
http://lists.busybox.net/pipermail/buildroot/2017-July/195927.html, i.e
the --no-dynamic-linker option doesn't exist in old binutils versions,
and will therefore cause a build failure.

BTW Arnout, you should not expect any feedback from Benoît, he has left
his previous employer, and explicitly removed himself from the syslinux
developer:
https://git.buildroot.org/buildroot/commit/DEVELOPERS?id=74a1e8f9f220c8fb95abe1de67ee5441b7c449e7.
He will most likely not even receive your e-mail.

Therefore, we are on our own to figure out this one :)

Thomas
Arnout Vandecappelle Aug. 15, 2017, 2:53 p.m. UTC | #2
On 14-08-17 22:09, Thomas Petazzoni wrote:
> Hello,
> 
> On Mon, 14 Aug 2017 01:28:35 +0200, Arnout Vandecappelle
> (Essensium/Mind) wrote:
>> It turns out that this patch is still needed, since with some versions
>> of binutils the error still occurs.
>>
>> Partially fixes: https://gitlab.com/arnout/buildroot/-/jobs/28979377
>>
>> This reverts commit 644c024edeb7e20bd96ce4426aeca2cbcd74d9b9.
>>
>> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>> Cc: Benoît Allard <benoit.allard@greenbone.net>
>> ---
>> The failing ts5x00_defconfig also requires a kernel bump
> 
> The problem with this is that you are going to run into the problem I
> reported at:
> http://lists.busybox.net/pipermail/buildroot/2017-July/195927.html, i.e
> the --no-dynamic-linker option doesn't exist in old binutils versions,
> and will therefore cause a build failure.

 Indeed, TestIso9660Syslinux{Ex,Int}ternal fail on it.

 I'm now trying with --omagic --no-omagic instead. If I read the man page
correctly, this should have more or less the same effect. It feels like a huge
hack though...

 Regards,
 Arnout
Arnout Vandecappelle Aug. 15, 2017, 9:25 p.m. UTC | #3
On 15-08-17 16:53, Arnout Vandecappelle wrote:
> 
> On 14-08-17 22:09, Thomas Petazzoni wrote:
>> Hello,
>>
>> On Mon, 14 Aug 2017 01:28:35 +0200, Arnout Vandecappelle
>> (Essensium/Mind) wrote:
>>> It turns out that this patch is still needed, since with some versions
>>> of binutils the error still occurs.
>>>
>>> Partially fixes: https://gitlab.com/arnout/buildroot/-/jobs/28979377
>>>
>>> This reverts commit 644c024edeb7e20bd96ce4426aeca2cbcd74d9b9.
>>>
>>> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
>>> Cc: Benoît Allard <benoit.allard@greenbone.net>
>>> ---
>>> The failing ts5x00_defconfig also requires a kernel bump
>> The problem with this is that you are going to run into the problem I
>> reported at:
>> http://lists.busybox.net/pipermail/buildroot/2017-July/195927.html, i.e
>> the --no-dynamic-linker option doesn't exist in old binutils versions,
>> and will therefore cause a build failure.
>  Indeed, TestIso9660Syslinux{Ex,Int}ternal fail on it.
> 
>  I'm now trying with --omagic --no-omagic instead. If I read the man page
> correctly, this should have more or less the same effect. It feels like a huge
> hack though...

 That didn't work...

 But I tried with latest master and that did work (after applying our
cross-compilation patches). Bisecting now...

 Regards,
 Arnout
diff mbox

Patch

diff --git a/boot/syslinux/0003-Fix-ldlinux.elf-Not-enough-room-for-program-headers-.patch b/boot/syslinux/0003-Fix-ldlinux.elf-Not-enough-room-for-program-headers-.patch
new file mode 100644
index 0000000000..83a87ee071
--- /dev/null
+++ b/boot/syslinux/0003-Fix-ldlinux.elf-Not-enough-room-for-program-headers-.patch
@@ -0,0 +1,35 @@ 
+From 61de7762389d460da7ffdd644f50c60175cce23b Mon Sep 17 00:00:00 2001
+From: Steve McIntyre <93sam@debian.org>
+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 <benoit.allard@greenbone.net>
+---
+ 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
+