summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/syslinux/files/cross-build.patch12
-rw-r--r--meta/packages/syslinux/syslinux_3.86.bb2
2 files changed, 10 insertions, 4 deletions
diff --git a/meta/packages/syslinux/files/cross-build.patch b/meta/packages/syslinux/files/cross-build.patch
index 69b3378ba..c90c7afba 100644
--- a/meta/packages/syslinux/files/cross-build.patch
+++ b/meta/packages/syslinux/files/cross-build.patch
@@ -5,6 +5,11 @@ because of the Makefile changes.
against 3.86
06/28/2010 - qhe
+
+also AUXDIR stays in $(LIBDIR)/syslinux rather than $(DATADIR)/syslinux
+
+07/08/2010 - qhe
+
---
diff --git a/MCONFIG b/MCONFIG
index e9c16d3..4d49f33 100644
@@ -18,13 +23,14 @@ index e9c16d3..4d49f33 100644
-SBINDIR = /sbin
-LIBDIR = /usr/lib
-DATADIR = /usr/share
+-AUXDIR = $(DATADIR)/syslinux
+-MANDIR = /usr/man
+-INCDIR = /usr/include
+BINDIR ?= /usr/bin
+SBINDIR ?= /sbin
+LIBDIR ?= /usr/lib
+DATADIR ?= /usr/share
- AUXDIR = $(DATADIR)/syslinux
--MANDIR = /usr/man
--INCDIR = /usr/include
++AUXDIR = $(LIBDIR)/syslinux
+MANDIR ?= /usr/man
+INCDIR ?= /usr/include
TFTPBOOT = /tftpboot
diff --git a/meta/packages/syslinux/syslinux_3.86.bb b/meta/packages/syslinux/syslinux_3.86.bb
index 2fbbf0d0b..fb26a32fa 100644
--- a/meta/packages/syslinux/syslinux_3.86.bb
+++ b/meta/packages/syslinux/syslinux_3.86.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 = "r0"
+PR = "r1"
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 \
file://cross-build.patch"