summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Price <daniel.price@gmail.com>2013-03-19 12:21:38 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2013-03-24 10:51:48 (GMT)
commitc12b0672264dc8c7ef0039d0c2aa6a58d6ae9bfb (patch)
tree2a8e7c1204ef3476bd2b5a310b6a3b775cf0a572
parent99fc6299dbceaf6d58be2fb516a346451968a704 (diff)
downloadbuildroot-c12b0672264dc8c7ef0039d0c2aa6a58d6ae9bfb.tar.gz
buildroot-c12b0672264dc8c7ef0039d0c2aa6a58d6ae9bfb.tar.bz2
syslinux: bump to version 4.06
Signed-off-by: Daniel Price <daniel.price@gmail.com> Tested-by: Will Moore <will.moore@beraninstruments.com> Tested-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--boot/syslinux/syslinux-build-fix-for-uuid.patch15
-rw-r--r--boot/syslinux/syslinux.mk2
2 files changed, 1 insertions, 16 deletions
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 04ff562..0000000
--- a/boot/syslinux/syslinux-build-fix-for-uuid.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Micah Gersten <micahg@ubuntu.com>
-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 f63f2e0..046bdc3 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/