From 07b8765e0d691e17fd3c5feb64259cee47b03a1a Mon Sep 17 00:00:00 2001
From: Qing He <qing.he@intel.com>
Date: Tue, 16 Nov 2010 13:32:31 +0800
Subject: syslinux: upgrade to version 4.03

from 3.86
rebased the patch

Signed-off-by: Qing He <qing.he@intel.com>
---
 .../syslinux/files/cross-build.patch               |  7 +++-
 meta/recipes-devtools/syslinux/syslinux_3.86.bb    | 46 ----------------------
 meta/recipes-devtools/syslinux/syslinux_4.03.bb    | 46 ++++++++++++++++++++++
 3 files changed, 52 insertions(+), 47 deletions(-)
 delete mode 100644 meta/recipes-devtools/syslinux/syslinux_3.86.bb
 create mode 100644 meta/recipes-devtools/syslinux/syslinux_4.03.bb

(limited to 'meta/recipes-devtools/syslinux')

diff --git a/meta/recipes-devtools/syslinux/files/cross-build.patch b/meta/recipes-devtools/syslinux/files/cross-build.patch
index c90c7afbaf..8115629fe9 100644
--- a/meta/recipes-devtools/syslinux/files/cross-build.patch
+++ b/meta/recipes-devtools/syslinux/files/cross-build.patch
@@ -10,6 +10,10 @@ also AUXDIR stays in $(LIBDIR)/syslinux rather than $(DATADIR)/syslinux
 
 07/08/2010 - qhe
 
+updated for 4.03
+
+11/16/2010 - Qing He <qing.he@intel.com>
+
 ---
 diff --git a/MCONFIG b/MCONFIG
 index e9c16d3..4d49f33 100644
@@ -43,7 +47,8 @@ index e9c16d3..4d49f33 100644
 -CC	 = gcc
 +CC	 ?= gcc
  gcc_ok   = $(shell tmpf=gcc_ok.$$$$.tmp; \
- 		   if $(CC) $(1) -c $(topdir)/dummy.c -o $$tmpf 2>/dev/null ; \
+ 		   if $(CC) $(GCCOPT) $(1) -c $(topdir)/dummy.c \
+ 			-o $$tmpf 2>/dev/null ; \
  		   then echo '$(1)'; else echo '$(2)'; fi; \
  		   rm -f $$tmpf)
  
diff --git a/meta/recipes-devtools/syslinux/syslinux_3.86.bb b/meta/recipes-devtools/syslinux/syslinux_3.86.bb
deleted file mode 100644
index 42295b5df3..0000000000
--- a/meta/recipes-devtools/syslinux/syslinux_3.86.bb
+++ /dev/null
@@ -1,46 +0,0 @@
-DESCRIPTION = "A multi-purpose linux bootloader"
-HOMEPAGE = "http://syslinux.zytor.com/"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
-                    file://README;beginline=28;endline=34;md5=a4607efd4a6392017186d08099e7d546"
-
-# 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"
-PR = "r1"
-
-SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 \
-           file://cross-build.patch"
-
-COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)'
-
-EXTRA_OEMAKE = " \
-	BINDIR=${bindir} SBINDIR=${sbindir} LIBDIR=${libdir} \
-	DATADIR=${datadir} MANDIR=${mandir} INCDIR=${includedir} \
-"
-# syslinux uses $LD for linking, strip `-Wl,' so it can work
-export LDFLAGS = "`echo $LDFLAGS | sed 's/-Wl,//g'`"
-
-do_configure() {
-	# drop win32 targets or build fails
-	sed -e 's,win32/\S*,,g' -i Makefile
-
-	# clean installer executables included in source tarball
-	oe_runmake clean
-}
-
-do_compile() {
-	# Rebuild only the installer; keep precompiled bootloaders
-	# as per author's request (doc/distrib.txt)
-	oe_runmake CC="${CC}" installer
-}
-
-do_install() {
-	oe_runmake install INSTALLROOT="${D}"
-
-	install -d ${D}${libdir}/syslinux/
-	install -m 644 ${S}/core/ldlinux.sys ${D}${libdir}/syslinux/
-	install -m 644 ${S}/core/ldlinux.bss ${D}${libdir}/syslinux/
-}
-
-BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/syslinux/syslinux_4.03.bb b/meta/recipes-devtools/syslinux/syslinux_4.03.bb
new file mode 100644
index 0000000000..74e3f609e3
--- /dev/null
+++ b/meta/recipes-devtools/syslinux/syslinux_4.03.bb
@@ -0,0 +1,46 @@
+DESCRIPTION = "A multi-purpose linux bootloader"
+HOMEPAGE = "http://syslinux.zytor.com/"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
+                    file://README;beginline=28;endline=34;md5=a4607efd4a6392017186d08099e7d546"
+
+# 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"
+PR = "r0"
+
+SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 \
+           file://cross-build.patch"
+
+COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)'
+
+EXTRA_OEMAKE = " \
+	BINDIR=${bindir} SBINDIR=${sbindir} LIBDIR=${libdir} \
+	DATADIR=${datadir} MANDIR=${mandir} INCDIR=${includedir} \
+"
+# syslinux uses $LD for linking, strip `-Wl,' so it can work
+export LDFLAGS = "`echo $LDFLAGS | sed 's/-Wl,//g'`"
+
+do_configure() {
+	# drop win32 targets or build fails
+	sed -e 's,win32/\S*,,g' -i Makefile
+
+	# clean installer executables included in source tarball
+	oe_runmake clean
+}
+
+do_compile() {
+	# Rebuild only the installer; keep precompiled bootloaders
+	# as per author's request (doc/distrib.txt)
+	oe_runmake CC="${CC}" installer
+}
+
+do_install() {
+	oe_runmake install INSTALLROOT="${D}"
+
+	install -d ${D}${libdir}/syslinux/
+	install -m 644 ${S}/core/ldlinux.sys ${D}${libdir}/syslinux/
+	install -m 644 ${S}/core/ldlinux.bss ${D}${libdir}/syslinux/
+}
+
+BBCLASSEXTEND = "native"
-- 
cgit v1.2.3-54-g00ecf