From: Joe Slater <jsla...@windriver.com>
ldlinux.sys is used when building an hdd image, and
isolinux.bin when building an iso bootimage. In both
cases, we want to look in the sysroot for MACHINE,
not in the one for the multilib we might be using.
Signed-off-by: Joe Slater <jsla...@windriver.com>
Signed-off-by: Jason Wessel <jason.wes...@windriver.com>
Signed-off-by: Mark Hatle <mark.ha...@windriver.com>
---
meta/classes/syslinux.bbclass | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index 501bc6d..2c7ecf6 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -38,11 +38,13 @@ syslinux_populate() {
install -m 0644 ${SYSLINUXCFG} ${DEST}${BOOTDIR}/${CFGNAME}
}
+# we want to pull isolinux.bin and ldlinux.sys from the MACHINE sysroot
+#
syslinux_iso_populate() {
syslinux_populate ${ISODIR} ${ISOLINUXDIR} isolinux.cfg
- install -m 0644 ${STAGING_DATADIR}/syslinux/isolinux.bin
${ISODIR}${ISOLINUXDIR}
+ install -m 0644
${STAGING_DIR}/${MACHINE}/${libdir}/syslinux/isolinux.bin
${ISODIR}${ISOLINUXDIR}
if [ "${AUTO_SYSLINUXMENU}" = 1 ] ; then
- install -m 0644 ${STAGING_DATADIR}/syslinux/vesamenu.c32
${ISODIR}${ISOLINUXDIR}/vesamenu.c32
+ install -m 0644
${STAGING_DIR}/${MACHINE}/${libdir}/syslinux/vesamenu.c32
${ISODIR}${ISOLINUXDIR}/vesamenu.c32
if [ "${SYSLINUX_SPLASH}" != "" ] ; then
install -m 0644 ${SYSLINUX_SPLASH}
${ISODIR}${ISOLINUXDIR}/splash.lss
fi
@@ -51,9 +53,9 @@ syslinux_iso_populate() {
syslinux_hddimg_populate() {
syslinux_populate ${HDDDIR} ${SYSLINUXDIR} syslinux.cfg
- install -m 0444 ${STAGING_DATADIR}/syslinux/ldlinux.sys
${HDDDIR}${SYSLINUXDIR}/ldlinux.sys
+ install -m 0444
${STAGING_DIR}/${MACHINE}/${libdir}/syslinux/ldlinux.sys
${HDDDIR}${SYSLINUXDIR}/ldlinux.sys
if [ "${AUTO_SYSLINUXMENU}" = 1 ] ; then
- install -m 0644 ${STAGING_DATADIR}/syslinux/vesamenu.c32
${HDDDIR}${SYSLINUXDIR}/vesamenu.c32
+ install -m 0644
${STAGING_DIR}/${MACHINE}/${libdir}/syslinux/vesamenu.c32
${ISODIR}${ISOLINUXDIR}/vesamenu.c32
if [ "${SYSLINUX_SPLASH}" != "" ] ; then
install -m 0644 ${SYSLINUX_SPLASH}
${HDDDIR}${SYSLINUXDIR}/splash.lss
fi
--
1.8.1.2.545.g2f19ada
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
