From cbba32fbf28ab88ee91992746f610c4a674707ea Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 23 Feb 2014 00:29:00 +0200
Subject: [PATCH] syslinux: update to syslinux-6.02. dont install isolinux

---
 packages/tools/syslinux/package.mk | 23 +++++++++++------------
 packages/tools/syslinux/release    |  4 ++--
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/packages/tools/syslinux/package.mk b/packages/tools/syslinux/package.mk
index 82f7ce6acb..e26d3f40c7 100644
--- a/packages/tools/syslinux/package.mk
+++ b/packages/tools/syslinux/package.mk
@@ -17,7 +17,7 @@
 ################################################################################
 
 PKG_NAME="syslinux"
-PKG_VERSION="5.10"
+PKG_VERSION="6.02"
 PKG_REV="1"
 PKG_ARCH="i386 x86_64"
 PKG_LICENSE="GPL"
@@ -63,29 +63,28 @@ make_host() {
   make CC=$CC \
        AR=$AR \
        RANLIB=$RANLIB \
-       CFLAGS="-I$ROOT/$TOOLCHAIN/include -I../libinstaller -I../libfat -fomit-frame-pointer -D_FILE_OFFSET_BITS=64" \
+       CFLAGS="-I$ROOT/$TOOLCHAIN/include -I$ROOT/$PKG_BUILD/libinstaller -I$ROOT/$PKG_BUILD/libfat -I$ROOT/$PKG_BUILD/bios -I$ROOT/$PKG_BUILD/utils -fomit-frame-pointer -D_FILE_OFFSET_BITS=64" \
        LDFLAGS="-L$ROOT/$TOOLCHAIN/lib" \
        installer
 }
 
 makeinstall_host() {
   mkdir -p $ROOT/$TOOLCHAIN/bin
-    cp extlinux/extlinux $ROOT/$TOOLCHAIN/bin
+    cp bios/extlinux/extlinux $ROOT/$TOOLCHAIN/bin
 
   mkdir -p $ROOT/$TOOLCHAIN/share/syslinux
-    cp com32/menu/vesamenu.c32 $ROOT/$TOOLCHAIN/share/syslinux
-    cp com32/lib/libcom32.c32 $ROOT/$TOOLCHAIN/share/syslinux
-    cp com32/libutil/libutil.c32 $ROOT/$TOOLCHAIN/share/syslinux
-    cp mbr/mbr.bin $ROOT/$TOOLCHAIN/share/syslinux
+    cp bios/com32/menu/vesamenu.c32 $ROOT/$TOOLCHAIN/share/syslinux
+    cp bios/com32/lib/libcom32.c32 $ROOT/$TOOLCHAIN/share/syslinux
+    cp bios/com32/libutil/libutil.c32 $ROOT/$TOOLCHAIN/share/syslinux
+    cp bios/mbr/mbr.bin $ROOT/$TOOLCHAIN/share/syslinux
 }
 
 makeinstall_target() {
   mkdir -p $INSTALL/usr/bin
-    cp extlinux/extlinux $INSTALL/usr/bin
-    cp linux/syslinux $INSTALL/usr/bin
+    cp bios/extlinux/extlinux $INSTALL/usr/bin
+    cp bios/linux/syslinux $INSTALL/usr/bin
 
   mkdir -p $INSTALL/usr/share/syslinux
-    cp core/isolinux.bin $INSTALL/usr/share/syslinux
-    cp mbr/mbr.bin $INSTALL/usr/share/syslinux
-    cp mbr/gptmbr.bin $INSTALL/usr/share/syslinux
+    cp bios/mbr/mbr.bin $INSTALL/usr/share/syslinux
+    cp bios/mbr/gptmbr.bin $INSTALL/usr/share/syslinux
 }
diff --git a/packages/tools/syslinux/release b/packages/tools/syslinux/release
index 561b6cff41..742d8a815a 100755
--- a/packages/tools/syslinux/release
+++ b/packages/tools/syslinux/release
@@ -28,7 +28,7 @@ mkdir -p $RELEASE_DIR/3rdparty/syslinux/doc
   cp -PR $BUILD/syslinux-*/doc/* $RELEASE_DIR/3rdparty/syslinux/doc
 
 mkdir -p $RELEASE_DIR/3rdparty/syslinux/win32
-  cp -PR $BUILD/syslinux-*/win32/syslinux.exe $RELEASE_DIR/3rdparty/syslinux/win32
+  cp -PR $BUILD/syslinux-*/bios/win32/syslinux.exe $RELEASE_DIR/3rdparty/syslinux/win32
 
 mkdir -p $RELEASE_DIR/3rdparty/syslinux/win64
-  cp -PR $BUILD/syslinux-*/win64/syslinux64.exe $RELEASE_DIR/3rdparty/syslinux/win64
+  cp -PR $BUILD/syslinux-*/bios/win64/syslinux64.exe $RELEASE_DIR/3rdparty/syslinux/win64