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>
This commit is contained in:
parent
72210f8a6a
commit
8a556a8ca5
|
@ -5,6 +5,11 @@ because of the Makefile changes.
|
||||||
against 3.86
|
against 3.86
|
||||||
|
|
||||||
06/28/2010 - qhe
|
06/28/2010 - qhe
|
||||||
|
|
||||||
|
also AUXDIR stays in $(LIBDIR)/syslinux rather than $(DATADIR)/syslinux
|
||||||
|
|
||||||
|
07/08/2010 - qhe
|
||||||
|
|
||||||
---
|
---
|
||||||
diff --git a/MCONFIG b/MCONFIG
|
diff --git a/MCONFIG b/MCONFIG
|
||||||
index e9c16d3..4d49f33 100644
|
index e9c16d3..4d49f33 100644
|
||||||
|
@ -18,13 +23,14 @@ index e9c16d3..4d49f33 100644
|
||||||
-SBINDIR = /sbin
|
-SBINDIR = /sbin
|
||||||
-LIBDIR = /usr/lib
|
-LIBDIR = /usr/lib
|
||||||
-DATADIR = /usr/share
|
-DATADIR = /usr/share
|
||||||
|
-AUXDIR = $(DATADIR)/syslinux
|
||||||
|
-MANDIR = /usr/man
|
||||||
|
-INCDIR = /usr/include
|
||||||
+BINDIR ?= /usr/bin
|
+BINDIR ?= /usr/bin
|
||||||
+SBINDIR ?= /sbin
|
+SBINDIR ?= /sbin
|
||||||
+LIBDIR ?= /usr/lib
|
+LIBDIR ?= /usr/lib
|
||||||
+DATADIR ?= /usr/share
|
+DATADIR ?= /usr/share
|
||||||
AUXDIR = $(DATADIR)/syslinux
|
+AUXDIR = $(LIBDIR)/syslinux
|
||||||
-MANDIR = /usr/man
|
|
||||||
-INCDIR = /usr/include
|
|
||||||
+MANDIR ?= /usr/man
|
+MANDIR ?= /usr/man
|
||||||
+INCDIR ?= /usr/include
|
+INCDIR ?= /usr/include
|
||||||
TFTPBOOT = /tftpboot
|
TFTPBOOT = /tftpboot
|
||||||
|
|
|
@ -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
|
# If you really want to run syslinux, you need mtools. We just want the
|
||||||
# ldlinux.* stuff for now, so skip mtools-native
|
# ldlinux.* stuff for now, so skip mtools-native
|
||||||
DEPENDS = "nasm-native"
|
DEPENDS = "nasm-native"
|
||||||
PR = "r0"
|
PR = "r1"
|
||||||
|
|
||||||
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 \
|
SRC_URI = "${KERNELORG_MIRROR}/pub/linux/utils/boot/syslinux/syslinux-${PV}.tar.bz2 \
|
||||||
file://cross-build.patch"
|
file://cross-build.patch"
|
||||||
|
|
Loading…
Reference in New Issue