diff options
| author | Qing He <qing.he@intel.com> | 2010-07-08 14:18:27 +0800 |
|---|---|---|
| committer | Saul Wold <Saul.Wold@intel.com> | 2010-07-08 21:11:00 -0700 |
| commit | 8a556a8ca5dfd22e06de57eaf7744ace1d0974a5 (patch) | |
| tree | 2a4d091eabe0fcc9e310758e3a2cbf52d6fc18d3 | |
| parent | 72210f8a6a327a4e0bbff5a811db9f8e0ae50c18 (diff) | |
| download | openembedded-core-8a556a8ca5dfd22e06de57eaf7744ace1d0974a5.tar.gz openembedded-core-8a556a8ca5dfd22e06de57eaf7744ace1d0974a5.tar.bz2 openembedded-core-8a556a8ca5dfd22e06de57eaf7744ace1d0974a5.zip | |
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.patch | 12 | ||||
| -rw-r--r-- | meta/packages/syslinux/syslinux_3.86.bb | 2 |
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. 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 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 \ # 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" |