summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2010-07-08 14:18:27 +0800
committerSaul Wold <Saul.Wold@intel.com>2010-07-08 21:11:00 -0700
commit8a556a8ca5dfd22e06de57eaf7744ace1d0974a5 (patch)
tree2a4d091eabe0fcc9e310758e3a2cbf52d6fc18d3
parent72210f8a6a327a4e0bbff5a811db9f8e0ae50c18 (diff)
downloadpoky-8a556a8ca5dfd22e06de57eaf7744ace1d0974a5.tar.gz
syslinux: use /usr/lib/syslinux as AUXDIR
instead of the upstream /usr/share/syslinux. This happens at some point between 3.36 to 3.86 The reason is unknown, stick in /usr/lib/syslinux for consistency for now Bump the PR as well Signed-off-by: Qing He <qing.he@intel.com>
-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 69b3378baf..c90c7afbaf 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.
5against 3.86 5against 3.86
6 6
706/28/2010 - qhe 706/28/2010 - qhe
8
9also AUXDIR stays in $(LIBDIR)/syslinux rather than $(DATADIR)/syslinux
10
1107/08/2010 - qhe
12
8--- 13---
9diff --git a/MCONFIG b/MCONFIG 14diff --git a/MCONFIG b/MCONFIG
10index e9c16d3..4d49f33 100644 15index e9c16d3..4d49f33 100644
@@ -18,13 +23,14 @@ index e9c16d3..4d49f33 100644
18-SBINDIR = /sbin 23-SBINDIR = /sbin
19-LIBDIR = /usr/lib 24-LIBDIR = /usr/lib
20-DATADIR = /usr/share 25-DATADIR = /usr/share
26-AUXDIR = $(DATADIR)/syslinux
27-MANDIR = /usr/man
28-INCDIR = /usr/include
21+BINDIR ?= /usr/bin 29+BINDIR ?= /usr/bin
22+SBINDIR ?= /sbin 30+SBINDIR ?= /sbin
23+LIBDIR ?= /usr/lib 31+LIBDIR ?= /usr/lib
24+DATADIR ?= /usr/share 32+DATADIR ?= /usr/share
25 AUXDIR = $(DATADIR)/syslinux 33+AUXDIR = $(LIBDIR)/syslinux
26-MANDIR = /usr/man
27-INCDIR = /usr/include
28+MANDIR ?= /usr/man 34+MANDIR ?= /usr/man
29+INCDIR ?= /usr/include 35+INCDIR ?= /usr/include
30 TFTPBOOT = /tftpboot 36 TFTPBOOT = /tftpboot
diff --git a/meta/packages/syslinux/syslinux_3.86.bb b/meta/packages/syslinux/syslinux_3.86.bb
index 2fbbf0d0bd..fb26a32fab 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 \
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
9DEPENDS = "nasm-native" 9DEPENDS = "nasm-native"
10PR = "r0" 10PR = "r1"
11 11
12SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 \ 12SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 \
13 file://cross-build.patch" 13 file://cross-build.patch"