diff options
author | Qing He <qing.he@intel.com> | 2010-11-16 13:32:31 +0800 |
---|---|---|
committer | Saul Wold <Saul.Wold@intel.com> | 2010-11-18 13:30:26 -0800 |
commit | 07b8765e0d691e17fd3c5feb64259cee47b03a1a (patch) | |
tree | 3da740bfbab6a3de919ca3bfaa10d862295f7fc4 /meta | |
parent | a57838dace0f2d9de9191558f8c6073c07d63ec5 (diff) | |
download | poky-07b8765e0d691e17fd3c5feb64259cee47b03a1a.tar.gz |
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')
-rw-r--r-- | meta/recipes-devtools/syslinux/files/cross-build.patch | 7 | ||||
-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 | |||
10 | 10 | ||
11 | 07/08/2010 - qhe | 11 | 07/08/2010 - qhe |
12 | 12 | ||
13 | updated for 4.03 | ||
14 | |||
15 | 11/16/2010 - Qing He <qing.he@intel.com> | ||
16 | |||
13 | --- | 17 | --- |
14 | diff --git a/MCONFIG b/MCONFIG | 18 | diff --git a/MCONFIG b/MCONFIG |
15 | index e9c16d3..4d49f33 100644 | 19 | index e9c16d3..4d49f33 100644 |
@@ -43,7 +47,8 @@ index e9c16d3..4d49f33 100644 | |||
43 | -CC = gcc | 47 | -CC = gcc |
44 | +CC ?= gcc | 48 | +CC ?= gcc |
45 | gcc_ok = $(shell tmpf=gcc_ok.$$$$.tmp; \ | 49 | gcc_ok = $(shell tmpf=gcc_ok.$$$$.tmp; \ |
46 | if $(CC) $(1) -c $(topdir)/dummy.c -o $$tmpf 2>/dev/null ; \ | 50 | if $(CC) $(GCCOPT) $(1) -c $(topdir)/dummy.c \ |
51 | -o $$tmpf 2>/dev/null ; \ | ||
47 | then echo '$(1)'; else echo '$(2)'; fi; \ | 52 | then echo '$(1)'; else echo '$(2)'; fi; \ |
48 | rm -f $$tmpf) | 53 | rm -f $$tmpf) |
49 | 54 | ||
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 \ | |||
7 | # If you really want to run syslinux, you need mtools. We just want the | 7 | # If you really want to run syslinux, you need mtools. We just want the |
8 | # ldlinux.* stuff for now, so skip mtools-native | 8 | # ldlinux.* stuff for now, so skip mtools-native |
9 | DEPENDS = "nasm-native" | 9 | DEPENDS = "nasm-native" |
10 | PR = "r1" | 10 | PR = "r0" |
11 | 11 | ||
12 | SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 \ | 12 | SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 \ |
13 | file://cross-build.patch" | 13 | file://cross-build.patch" |