From: Michael Tremer Date: Sun, 17 Jun 2018 21:49:14 +0000 (+0100) Subject: syslinux: Update to 6.04-pre1 X-Git-Tag: v2.21-core124~77^2~26 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=7c80f8c5cc517e4c39824f038cd3867518e4f262 syslinux: Update to 6.04-pre1 Signed-off-by: Michael Tremer --- diff --git a/config/rootfiles/common/x86_64/syslinux b/config/rootfiles/common/x86_64/syslinux index a41049f21a..8bab25a02a 100644 --- a/config/rootfiles/common/x86_64/syslinux +++ b/config/rootfiles/common/x86_64/syslinux @@ -58,6 +58,7 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/com32.h #usr/share/syslinux/com32/include/console.h #usr/share/syslinux/com32/include/cpufeature.h +#usr/share/syslinux/com32/include/ctime.h #usr/share/syslinux/com32/include/ctype.h #usr/share/syslinux/com32/include/dev.h #usr/share/syslinux/com32/include/dhcp.h @@ -145,8 +146,10 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/png.h #usr/share/syslinux/com32/include/pngconf.h #usr/share/syslinux/com32/include/refstr.h +#usr/share/syslinux/com32/include/serial.h #usr/share/syslinux/com32/include/setjmp.h #usr/share/syslinux/com32/include/sort.h +#usr/share/syslinux/com32/include/srecsend.h #usr/share/syslinux/com32/include/stdarg.h #usr/share/syslinux/com32/include/stdbool.h #usr/share/syslinux/com32/include/stddef.h @@ -208,9 +211,11 @@ usr/bin/isohybrid #usr/share/syslinux/com32/include/syslinux/vesacon.h #usr/share/syslinux/com32/include/syslinux/video.h #usr/share/syslinux/com32/include/syslinux/zio.h +#usr/share/syslinux/com32/include/tftp.h #usr/share/syslinux/com32/include/time.h #usr/share/syslinux/com32/include/tinyjpeg.h #usr/share/syslinux/com32/include/unistd.h +#usr/share/syslinux/com32/include/upload_backend.h #usr/share/syslinux/com32/include/zconf.h #usr/share/syslinux/com32/include/zlib.h #usr/share/syslinux/com32/libcom32upload.a @@ -227,6 +232,7 @@ usr/bin/isohybrid #usr/share/syslinux/diag/geodsp1s.img.xz #usr/share/syslinux/diag/geodspms.img.xz #usr/share/syslinux/diag/handoff.bin +#usr/share/syslinux/dir.c32 #usr/share/syslinux/disk.c32 #usr/share/syslinux/dmi.c32 #usr/share/syslinux/dmitest.c32 @@ -246,22 +252,15 @@ usr/bin/isohybrid #usr/share/syslinux/efi64/cpuidtest.c32 #usr/share/syslinux/efi64/debug.c32 #usr/share/syslinux/efi64/dhcp.c32 -#usr/share/syslinux/efi64/disk.c32 +#usr/share/syslinux/efi64/dir.c32 #usr/share/syslinux/efi64/dmi.c32 #usr/share/syslinux/efi64/dmitest.c32 -#usr/share/syslinux/efi64/elf.c32 -#usr/share/syslinux/efi64/ethersel.c32 #usr/share/syslinux/efi64/gfxboot.c32 -#usr/share/syslinux/efi64/gpxecmd.c32 #usr/share/syslinux/efi64/hdt.c32 #usr/share/syslinux/efi64/hexdump.c32 #usr/share/syslinux/efi64/host.c32 #usr/share/syslinux/efi64/ifcpu.c32 #usr/share/syslinux/efi64/ifcpu64.c32 -#usr/share/syslinux/efi64/ifmemdsk.c32 -#usr/share/syslinux/efi64/ifplop.c32 -#usr/share/syslinux/efi64/kbdmap.c32 -#usr/share/syslinux/efi64/kontron_wdt.c32 #usr/share/syslinux/efi64/ldlinux.e64 #usr/share/syslinux/efi64/lfs.c32 #usr/share/syslinux/efi64/libcom32.c32 @@ -276,21 +275,13 @@ usr/bin/isohybrid #usr/share/syslinux/efi64/meminfo.c32 #usr/share/syslinux/efi64/menu.c32 #usr/share/syslinux/efi64/pci.c32 -#usr/share/syslinux/efi64/pcitest.c32 -#usr/share/syslinux/efi64/pmload.c32 -#usr/share/syslinux/efi64/poweroff.c32 -#usr/share/syslinux/efi64/prdhcp.c32 #usr/share/syslinux/efi64/pwd.c32 -#usr/share/syslinux/efi64/pxechn.c32 #usr/share/syslinux/efi64/reboot.c32 #usr/share/syslinux/efi64/rosh.c32 -#usr/share/syslinux/efi64/sanboot.c32 -#usr/share/syslinux/efi64/sdi.c32 #usr/share/syslinux/efi64/sysdump.c32 #usr/share/syslinux/efi64/syslinux.c32 #usr/share/syslinux/efi64/syslinux.efi #usr/share/syslinux/efi64/vesa.c32 -#usr/share/syslinux/efi64/vesainfo.c32 #usr/share/syslinux/efi64/vesamenu.c32 #usr/share/syslinux/efi64/vpdtest.c32 #usr/share/syslinux/efi64/whichsys.c32 @@ -302,8 +293,6 @@ usr/bin/isohybrid #usr/share/syslinux/gptmbr_c.bin #usr/share/syslinux/gptmbr_f.bin #usr/share/syslinux/gpxecmd.c32 -#usr/share/syslinux/gpxelinux.0 -#usr/share/syslinux/gpxelinuxk.0 #usr/share/syslinux/hdt.c32 #usr/share/syslinux/hexdump.c32 #usr/share/syslinux/host.c32 diff --git a/lfs/syslinux b/lfs/syslinux index 1736d3c685..9d95cd5a16 100644 --- a/lfs/syslinux +++ b/lfs/syslinux @@ -24,7 +24,7 @@ include Config -VER = 6.03 +VER = 6.04-pre1 THISAPP = syslinux-$(VER) DL_FILE = $(THISAPP).tar.xz @@ -44,7 +44,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 92a253df9211e9c20172796ecf388f13 +$(DL_FILE)_MD5 = f9c956fde0de29be297402ecbc8ff4d0 install : $(TARGET) @@ -74,7 +74,6 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/syslinux-6.03-fix-FTBFS-no-dynamic-linker.patch # Build cd $(DIR_APP) && make bios $(MAKETUNING) diff --git a/src/patches/syslinux-6.03-fix-FTBFS-no-dynamic-linker.patch b/src/patches/syslinux-6.03-fix-FTBFS-no-dynamic-linker.patch deleted file mode 100644 index 091189d7b6..0000000000 --- a/src/patches/syslinux-6.03-fix-FTBFS-no-dynamic-linker.patch +++ /dev/null @@ -1,14 +0,0 @@ -Fix for https://bugs.debian.org/846679 : syslinux: FTBFS: ld: -ldlinux.elf: Not enough room for program headers, try linking with -N - ---- a/core/Makefile 2017-01-28 18:33:22.750959519 +0000 -+++ b/core/Makefile 2017-01-28 18:27:47.387981830 +0000 -@@ -165,7 +165,7 @@ - - %.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)