summaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>2012-01-21 22:39:34 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2012-01-22 22:56:47 +0100
commit48558c83cbc961dac6e4a51cc202a98374436fbe (patch)
tree86dacee7fe906d701b2df547ec879c11ba9f989a /boot
parent5c8747d2c426323aabbbe07a34b2796bdfb68ca7 (diff)
syslinux: bump to version 4.04
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'boot')
-rw-r--r--boot/syslinux/syslinux-3.85-makefile.patch17
-rw-r--r--boot/syslinux/syslinux.mk4
2 files changed, 2 insertions, 19 deletions
diff --git a/boot/syslinux/syslinux-3.85-makefile.patch b/boot/syslinux/syslinux-3.85-makefile.patch
deleted file mode 100644
index ff85b8dc9..000000000
--- a/boot/syslinux/syslinux-3.85-makefile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: syslinux-3.85/Makefile
-===================================================================
---- syslinux-3.85.orig/Makefile
-+++ syslinux-3.85/Makefile
-@@ -43,7 +43,7 @@
- mbr/mbr_c.bin mbr/altmbr_c.bin mbr/gptmbr_c.bin \
- mbr/mbr_f.bin mbr/altmbr_f.bin mbr/gptmbr_f.bin \
- core/pxelinux.0 core/isolinux.bin core/isolinux-debug.bin \
-- gpxe/gpxelinux.0 dos/syslinux.com win32/syslinux.exe \
-+ gpxe/gpxelinux.0 dos/syslinux.com \
- dosutil/*.com dosutil/*.sys \
- $(MODULES)
-
diff --git a/boot/syslinux/syslinux.mk b/boot/syslinux/syslinux.mk
index fa5af0701..da30d5a20 100644
--- a/boot/syslinux/syslinux.mk
+++ b/boot/syslinux/syslinux.mk
@@ -4,9 +4,9 @@
#
#############################################################
-SYSLINUX_VERSION = 3.85
+SYSLINUX_VERSION = 4.04
SYSLINUX_SOURCE = syslinux-$(SYSLINUX_VERSION).tar.bz2
-SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/3.xx/
+SYSLINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/boot/syslinux/4.xx/
SYSLINUX_INSTALL_TARGET = NO
SYSLINUX_INSTALL_IMAGES = YES