syslinux: Upgrade to 3.11

4 files changed, 56 insertions, 2 deletions

diff --git a/packages/syslinux/syslinux-native-2.11/.mtn2git_empty b/packages/syslinux/syslinux-native-2.11/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/syslinux/syslinux-native-2.11/.mtn2git_empty
diff --git a/packages/syslinux/syslinux-native-2.11/edx_assume_zero.patch b/packages/syslinux/syslinux-native-2.11/edx_assume_zero.patch
new file mode 100644
index 0000000000..7243464224
--- /dev/null
+++ b/packages/syslinux/syslinux-native-2.11/edx_assume_zero.patch
@@ -0,0 +1,10 @@
+--- syslinux-2.11/ldlinux.asm.orig	2005-11-01 14:25:10.767581544 -0700
++++ syslinux-2.11/ldlinux.asm	2005-11-01 14:25:42.175806768 -0700
+@@ -724,7 +724,6 @@
+ 		
+ 		mov eax,[bsHidden]		; Hidden sectors
+ 		add edx,[bxResSectors]
+-		add eax,edx
+ 		mov ecx,[bxFATsecs]		; Sectors/FAT
+ fat_load_loop:	
+ 		mov ebp,ecx			; Make sure high EBP = 0
diff --git a/packages/syslinux/syslinux-native_2.11.bb b/packages/syslinux/syslinux-native_2.11.bb
index 398a3f8b69..3c41afb945 100644
--- a/packages/syslinux/syslinux-native_2.11.bb
+++ b/packages/syslinux/syslinux-native_2.11.bb
@@ -1,12 +1,16 @@
 # syslinux-native OE build file
-# Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
+# Copyright (C) 2004-2006, Advanced Micro Devices, Inc.  All Rights Reserved
 # Released under the MIT license (see packages/COPYING)
 
 DESCRIPTION="A multi-purpose linux bootloader"
 HOMEPAGE="http://syslinux.zytor.com/"
+MAINTAINER = "Raymond Danks <raymondd@ia.amd.com>"
 LICENSE="GPL"
 
-SRC_URI="http://www.kernel.org/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.tar.bz2"
+PR="r1"
+
+SRC_URI="http://www.kernel.org/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.tar.bz2 \
+file://edx_assume_zero.patch;patch=1"
 
 S="${WORKDIR}/syslinux-${PV}"
 
diff --git a/packages/syslinux/syslinux-native_3.11.bb b/packages/syslinux/syslinux-native_3.11.bb
new file mode 100644
index 0000000000..f3a040b874
--- /dev/null
+++ b/packages/syslinux/syslinux-native_3.11.bb
@@ -0,0 +1,40 @@
+# syslinux-native OE build file
+# Copyright (C) 2004-2006, Advanced Micro Devices, Inc.  All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION="A multi-purpose linux bootloader"
+HOMEPAGE="http://syslinux.zytor.com/"
+MAINTAINER = "Raymond Danks <raymondd@ia.amd.com>"
+LICENSE="GPL"
+
+PR="r1"
+
+SRC_URI="http://www.kernel.org/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 "
+
+S="${WORKDIR}/syslinux-${PV}"
+
+# If you really want to run syslinux, you need mtools.  We just want the 
+# ldlinux.* stuff for now, so skip mtools-native
+
+DEPENDS="nasm-native"
+
+inherit native
+
+STAGE_TEMP=${WORKDIR}/stage_temp
+
+do_stage() {
+	install -d ${STAGE_TEMP}
+	oe_runmake install INSTALLROOT="${STAGE_TEMP}"
+
+	install -d ${STAGING_BINDIR}
+	install -m 755 ${STAGE_TEMP}/usr/bin/syslinux ${STAGING_BINDIR}
+
+	# When building media, the syslinux binary isn't nearly as useful
+	# as the DOS data files, so we copy those into a special location
+	# for usage during a image build stage
+
+	install -d ${STAGING_DATADIR}/syslinux
+	install -m 0644 ${STAGE_TEMP}/usr/lib/syslinux/isolinux.bin ${STAGING_DATADIR}/syslinux/isolinux.bin
+	install -m 644 ${S}/ldlinux.sys ${STAGING_DATADIR}/syslinux/ldlinux.sys
+	install -m 644 ${S}/ldlinux.bss ${STAGING_DATADIR}/syslinux/ldlinux.bss
+}