7 files changed, 36 insertions, 79 deletions
diff --git a/packages/syslinux/syslinux-native-2.11/edx_assume_zero.patch b/packages/syslinux/syslinux-native-2.11/edx_assume_zero.patch
deleted file mode 100644
index 7243464224..0000000000
--- a/packages/syslinux/syslinux-native-2.11/edx_assume_zero.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
deleted file mode 100644
index 6fe5491e6d..0000000000
--- a/packages/syslinux/syslinux-native_2.11.bb
+++ /dev/null
@@ -1,10 +0,0 @@
-PR ="r1"
-
-SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.tar.bz2 \
-         file://edx_assume_zero.patch;patch=1"
-
-require syslinux.inc
-
-do_compile() {
-	oe_runmake syslinux
-}
diff --git a/packages/syslinux/syslinux-native_3.11.bb b/packages/syslinux/syslinux-native_3.11.bb
deleted file mode 100644
index 4eb8c4f075..0000000000
--- a/packages/syslinux/syslinux-native_3.11.bb
+++ /dev/null
@@ -1,5 +0,0 @@
-PR ="r1"
-
-SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/Old/syslinux-${PV}.tar.bz2 "
-
-require syslinux3.inc
diff --git a/packages/syslinux/syslinux-native_3.31.bb b/packages/syslinux/syslinux-native_3.31.bb
deleted file mode 100644
index 6971874ea3..0000000000
--- a/packages/syslinux/syslinux-native_3.31.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-SRC_URI="${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 "
-
-require syslinux3.inc
diff --git a/packages/syslinux/syslinux-native_3.63.bb b/packages/syslinux/syslinux-native_3.63.bb
index d9019a4ab4..471ef1bc8f 100644
--- a/packages/syslinux/syslinux-native_3.63.bb
+++ b/packages/syslinux/syslinux-native_3.63.bb
@@ -1,3 +1,38 @@
+# 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/"
+LICENSE="GPL"
+PR="r1"
+
+# 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"
+
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 "
 
-require syslinux3.inc
+S="${WORKDIR}/syslinux-${PV}"
+
+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}
+	install -m 755 ${STAGE_TEMP}/sbin/extlinux ${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
+}
diff --git a/packages/syslinux/syslinux.inc b/packages/syslinux/syslinux.inc
deleted file mode 100644
index 41be168d12..0000000000
--- a/packages/syslinux/syslinux.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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/"
-LICENSE="GPL"
-
-# 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"
-
-S="${WORKDIR}/syslinux-${PV}"
-
-
-inherit native
-
-do_stage() {
-	install -d ${STAGING_BINDIR}
-	install -m 755 ${S}/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 644 ${S}/ldlinux.sys ${STAGING_DATADIR}/syslinux/ldlinux.sys
-	install -m 644 ${S}/ldlinux.bss ${STAGING_DATADIR}/syslinux/ldlinux.bss
-}
diff --git a/packages/syslinux/syslinux3.inc b/packages/syslinux/syslinux3.inc
deleted file mode 100644
index 95124d6160..0000000000
--- a/packages/syslinux/syslinux3.inc
+++ /dev/null
@@ -1,21 +0,0 @@
-require syslinux.inc
-
-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}
-	install -m 755 ${STAGE_TEMP}/sbin/extlinux ${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
-}