summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/syslinux
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2010-11-16 13:32:31 +0800
committerSaul Wold <Saul.Wold@intel.com>2010-11-18 13:30:26 -0800
commit07b8765e0d691e17fd3c5feb64259cee47b03a1a (patch)
tree3da740bfbab6a3de919ca3bfaa10d862295f7fc4 /meta/recipes-devtools/syslinux
parenta57838dace0f2d9de9191558f8c6073c07d63ec5 (diff)
downloadpoky-07b8765e0d691e17fd3c5feb64259cee47b03a1a.tar.gz
poky-07b8765e0d691e17fd3c5feb64259cee47b03a1a.tar.bz2
poky-07b8765e0d691e17fd3c5feb64259cee47b03a1a.zip
syslinux: upgrade to version 4.03
from 3.86 rebased the patch Signed-off-by: Qing He <qing.he@intel.com>
Diffstat (limited to 'meta/recipes-devtools/syslinux')
-rw-r--r--meta/recipes-devtools/syslinux/files/cross-build.patch7
-rw-r--r--meta/recipes-devtools/syslinux/syslinux_4.03.bb (renamed from meta/recipes-devtools/syslinux/syslinux_3.86.bb)2
2 files changed, 7 insertions, 2 deletions
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_4.03.bb
index 42295b5df3..74e3f609e3 100644
--- a/meta/recipes-devtools/syslinux/syslinux_3.86.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_4.03.bb
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
# 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"
+PR = "r0"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 \
file://cross-build.patch"