From c12b0672264dc8c7ef0039d0c2aa6a58d6ae9bfb Mon Sep 17 00:00:00 2001 From: Daniel Price Date: Tue, 19 Mar 2013 12:21:38 +0000 Subject: [PATCH] syslinux: bump to version 4.06 Signed-off-by: Daniel Price Tested-by: Will Moore Tested-by: Vivien Didelot Signed-off-by: Peter Korsgaard --- boot/syslinux/syslinux-build-fix-for-uuid.patch | 15 --------------- boot/syslinux/syslinux.mk | 2 +- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 boot/syslinux/syslinux-build-fix-for-uuid.patch diff --git a/boot/syslinux/syslinux-build-fix-for-uuid.patch b/boot/syslinux/syslinux-build-fix-for-uuid.patch deleted file mode 100644 index 04ff562356..0000000000 --- a/boot/syslinux/syslinux-build-fix-for-uuid.patch +++ /dev/null @@ -1,15 +0,0 @@ -Author: Micah Gersten -Description: Fix build failure with --as-needed (Closes: #654838). - -diff -Naurp syslinux.orig/utils/Makefile syslinux/utils/Makefile ---- syslinux.orig/utils/Makefile 2011-12-23 14:53:26.653571511 +0100 -+++ syslinux/utils/Makefile 2012-01-22 18:55:03.849466924 +0100 -@@ -51,7 +51,7 @@ isohdpfx.c: $(ISOHDPFX) isohdpfxarray.pl - $(PERL) isohdpfxarray.pl $(ISOHDPFX) > $@ - - isohybrid: isohybrid.o isohdpfx.o -- $(CC) $(LDFLAGS) -luuid -o $@ $^ -+ $(CC) $(LDFLAGS) -o $@ $^ -luuid - - gethostip: gethostip.o - $(CC) $(LDFLAGS) -o $@ $^ diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk index f63f2e06c3..046bdc352f 100644 --- a/boot/syslinux/syslinux.mk +++ b/boot/syslinux/syslinux.mk @@ -4,7 +4,7 @@ # ############################################################# -SYSLINUX_VERSION = 4.05 +SYSLINUX_VERSION = 4.06 SYSLINUX_SOURCE = syslinux-$(SYSLINUX_VERSION).tar.bz2 SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/4.xx/ -- 2.30.2