Skip to contentSkip to conversation

boot/syslinux: Bump to 6.04-pre2

PATCH Andreas Ziegler 2 participants 3 messages Sep 6 – Sep 19 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw

Hi Alexander,

I was curious if I could replace the syslinux host package and tried this patch; unfortunately I ran into various issues.

Quoted 6 lines

And change the source URL to use new upstream GIT repo:
http://repo.or.cz/syslinux.git
The revision to build comes from Archlinux syslinux package.

Quoted 16 lines
---
 ...bios-Fix-alignment-change-with-gcc-5.patch |  82 ---
 ...Use-the-host-toolchain-for-prepcore.patch} |   8 +-
 ...-Disable-PIE-to-avoid-FTBFS-on-amd64.patch |  30 -
 ...nux-Use-the-host-toolchain-to-build.patch} |   0
 ...-binutils-note-gnu-property-section.patch} |   0
 ...sk-Force-ld-output-format-to-32-bits.patch |  32 -
 ...0004-efi-main.c-include-efisetjmp.h.patch} |   0
 ...tils-Use-the-host-toolchain-to-build.patch |  60 --
 ...ition-is-now-part-of-the-exports-of-.patch |  37 --
 ...ump-calls-to-fit-the-new-declaration.patch |  37 --
 ...per-build-it-with-the-host-toolchain.patch |  32 -
 ...-try-to-guess-the-sections-alignment.patch | 295 ---------
 ...10-core-Clean-up-the-i386-bios-build.patch | 622 ------------------
 ...-sysmacros-h-for-major-minor-makedev.patch |  34 -
 ...multiple-definition-of-symbol-errors.patch |  25 +-

utils/check-package shows warnings; you should add "Upstream:" tags for the patches you add.

Quoted 2 lines
 boot/syslinux/syslinux.hash                   |   3 +-
 boot/syslinux/syslinux.mk                     |   6 +-

Building syslinux ran into some errors; this was the sequence:

ERROR: No hash found for syslinux-bf6db5b4-git4.tar.gz

Applying 0004-efi-main.c-include-efisetjmp.h.patch using patch:
patching file efi/main.c
Hunk #1 FAILED at 12.
1 out of 1 hunk FAILED -- saving rejects to file efi/main.c.rej

Applying 0013-Fix-build-with-gnu-efi-version-3.0.9.patch using patch:
patching file mk/lib.mk
Hunk #1 FAILED at 186.
1 out of 2 hunks FAILED -- saving rejects to file mk/lib.mk.rej

Applying 0021-load_linux-correct-a-type.patch using patch:
patching file com32/lib/syslinux/load_linux.c
Reversed (or previously applied) patch detected! Skipping patch.
1 out of 1 hunk ignored -- saving rejects to file com32/lib/syslinux/load_linux.c.rej

Applying 0024-efi-main.c-fix-incorrect-type-of-load_error_buf.patch using patch:
patching file efi/main.c
Hunk #1 FAILED at 30.
1 out of 1 hunk FAILED -- saving rejects to file efi/main.c.rej

make[6]: *** No rule to make target 'setjmp.o', needed by 'libcom32core.a'. Stop.
make[5]: *** [/home/data/buildroot.x86_64/build/syslinux-6.04/com32/Makefile:8: lib] Error 2 make[4]: *** [/home/data/buildroot.x86_64/build/syslinux-6.04/Makefile:288: com32] Error 2 make[3]: *** [/home/data/buildroot.x86_64/build/syslinux-6.04/Makefile:257: bios] Error 2 make[2]: *** [Makefile:102: bios] Error 2
make[1]: *** [package/pkg-generic.mk:273: /home/data/buildroot.x86_64/build/syslinux-6.04/.stamp_built] Error 2

(this and the patch error with 0013 look as if a patch is missing before 0013)

I gave up after this one.

<...>

Quoted 19 lines
boot/syslinux/syslinux.hash +0 -1
index 9bec3a20e7..2a98641da5 100644
@@ -1,4 +1,3 @@
-# From 

https://www.kernel.org/pub/linux/utils/boot/syslinux/sha256sums.asc
-sha256
26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e syslinux-6.03.tar.xz
# Locally computed
+sha256
d6d6ed482ff30358ce203d74d4e35413185485ebb315e89db24790e769e23e4c syslinux-bf6db5b4-br1.tar.gz
sha256
dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING

boot/syslinux/syslinux.mk +0 -0
index f938634c35..3d24869e59 100644

boot/syslinux/syslinux.mk s · line 10

Quoted 10 lines
boot/syslinux/syslinux.mk +3 -3
@@ -4,9 +4,9 @@s
 #
 
 ################################################################################
 
-SYSLINUX_VERSION = 6.03
-SYSLINUX_SOURCE = syslinux-$(SYSLINUX_VERSION).tar.xz
-SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux
+SYSLINUX_VERSION = bf6db5b4
+SYSLINUX_SITE = http://repo.or.cz/syslinux.git
+SYSLINUX_SITE_METHOD = git

You could also use the Debian archive for this version, it would save cloning ~50 MB of repository:

https://snapshot.debian.org/archive/debian/20260905T023709Z/pool/main/s/syslinux/syslinux_6.04~git20190206.bf6db5b4%2Bdfsg1.orig.tar.xz

Quoted 5 lines
boot/syslinux/syslinux.mk +0 -1
 SYSLINUX_LICENSE = GPL-2.0+
 SYSLINUX_LICENSE_FILES = COPYING
--

2.55.0

Kind regards,
Andreas
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot

#2 lore raw

Thanks for the test and the feedback Andreas!

Quoted 26 lines · Andreas Ziegler

I was curious if I could replace the syslinux host package and tried this patch; unfortunately I ran into various issues.

Quoted 7 lines

And change the source URL to use new upstream GIT repo:
http://repo.or.cz/syslinux.git
The revision to build comes from Archlinux syslinux package.

---

Quoted 15 lines
  ...bios-Fix-alignment-change-with-gcc-5.patch |  82 ---
  ...Use-the-host-toolchain-for-prepcore.patch} |   8 +-
  ...-Disable-PIE-to-avoid-FTBFS-on-amd64.patch |  30 -
  ...nux-Use-the-host-toolchain-to-build.patch} |   0
  ...-binutils-note-gnu-property-section.patch} |   0
  ...sk-Force-ld-output-format-to-32-bits.patch |  32 -
  ...0004-efi-main.c-include-efisetjmp.h.patch} |   0
  ...tils-Use-the-host-toolchain-to-build.patch |  60 --
  ...ition-is-now-part-of-the-exports-of-.patch |  37 --
  ...ump-calls-to-fit-the-new-declaration.patch |  37 --
  ...per-build-it-with-the-host-toolchain.patch |  32 -
  ...-try-to-guess-the-sections-alignment.patch | 295 ---------
  ...10-core-Clean-up-the-i386-bios-build.patch | 622 ------------------
  ...-sysmacros-h-for-major-minor-makedev.patch |  34 -
  ...multiple-definition-of-symbol-errors.patch |  25 +-
Quoted 7 lines

utils/check-package shows warnings; you should add "Upstream:" tags for the patches you add.

Quoted 2 lines

  boot/syslinux/syslinux.hash                   |   3 +- boot/syslinux/syslinux.mk                     |   6 +-

Building syslinux ran into some errors; this was the sequence:

I'm sorry, it was indeed some time ago that the patch has been tested and the current buildroot seems to have changed in the meanwhile.

While the mechanical rebase went without issues, seems that I'd need to do some homework here and test it better next time.

I'll address the issues found in v2.

Signature · 5 lines
Alexander Sverdlin.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#3 lore raw
In reply to a message not in the archive

Hi Alexander,

sorr, forgot to mention that this is a BIOS build.

On 2026-08-30 20:19, Alexander Sverdlin wrote:

<...>

Quoted 45 lines
 ...bios-Fix-alignment-change-with-gcc-5.patch |  82 ---
 ...Use-the-host-toolchain-for-prepcore.patch} |   8 +-
 ...-Disable-PIE-to-avoid-FTBFS-on-amd64.patch |  30 -
 ...nux-Use-the-host-toolchain-to-build.patch} |   0
 ...-binutils-note-gnu-property-section.patch} |   0
 ...sk-Force-ld-output-format-to-32-bits.patch |  32 -
 ...0004-efi-main.c-include-efisetjmp.h.patch} |   0
 ...tils-Use-the-host-toolchain-to-build.patch |  60 --
 ...ition-is-now-part-of-the-exports-of-.patch |  37 --
 ...ump-calls-to-fit-the-new-declaration.patch |  37 --
 ...per-build-it-with-the-host-toolchain.patch |  32 -
 ...-try-to-guess-the-sections-alignment.patch | 295 ---------
 ...10-core-Clean-up-the-i386-bios-build.patch | 622 ------------------
 ...-sysmacros-h-for-major-minor-makedev.patch |  34 -
 ...multiple-definition-of-symbol-errors.patch |  25 +-
 boot/syslinux/syslinux.hash                   |   3 +-
 boot/syslinux/syslinux.mk                     |   6 +-
 17 files changed, 12 insertions(+), 1291 deletions(-)
 delete mode 100644 
boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch
 rename 
boot/syslinux/{0005-lzo-Use-the-host-toolchain-for-prepcore.patch => 0001-lzo-Use-the-host-toolchain-for-prepcore.patch} (84%)
 delete mode 100644 
boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch
 rename 
boot/syslinux/{0011-extlinux-Use-the-host-toolchain-to-build.patch => 0002-extlinux-Use-the-host-toolchain-to-build.patch} (100%)
 rename 
boot/syslinux/{0014-Fix-build-with-binutils-note-gnu-property-section.patch => 0003-Fix-build-with-binutils-note-gnu-property-section.patch} (100%)
 delete mode 100644 
boot/syslinux/0003-memdisk-Force-ld-output-format-to-32-bits.patch
 rename boot/syslinux/{0015-efi-main.c-include-efisetjmp.h.patch => 
0004-efi-main.c-include-efisetjmp.h.patch} (100%)
 delete mode 100644 
boot/syslinux/0004-utils-Use-the-host-toolchain-to-build.patch
 delete mode 100644 
boot/syslinux/0006-The-VPrint-definition-is-now-part-of-the-exports-of-.patch
 delete mode 100644 
boot/syslinux/0007-Update-the-longjump-calls-to-fit-the-new-declaration.patch
 delete mode 100644 
boot/syslinux/0008-efi-wrapper-build-it-with-the-host-toolchain.patch
 delete mode 100644 
boot/syslinux/0009-bios-Don-t-try-to-guess-the-sections-alignment.patch
 delete mode 100644 
boot/syslinux/0010-core-Clean-up-the-i386-bios-build.patch
 delete mode 100644 
Quoted 1 line

boot/syslinux/0012-pull-in-sys-sysmacros-h-for-major-minor-makedev.patch

Patch 0013 needs to be adapted to the new directory layout ($(ARCH)):

@@ -203,6 +203,11 @@ CORELIBOBJS = \
$(LIBENTRY_OBJS) \
$(LIBMODULE_OBJS)

+ifndef EFI_BUILD
+# For EFI, these are part of gnu-efi +CORELIBOBJS += $(ARCH)/setjmp.o memcpy.o memset.o +endif
+
LDFLAGS = -m elf_$(ARCH) --hash-style=gnu -T
$(com32)/lib/$(ARCH)/elf.ld

.SUFFIXES: .c .o .a .so .lo .i .S .s .ls .ss .lss

<...>

Kind regards,
Andreas
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot