From: Jackie Huang <jackie.hu...@windriver.com>
syslinux files isolinux.bin, ldlinux.sys and vesamenu.c32 are used
when building hdd/iso image, but in multilib case, STAGING_DATADIR
points to ${MLPREFIX}${MACHINE} in sysroot which is not correct
for pulling syslinux files, fix it to ${MACHINE}.
Signed-off-by: Jackie Huang <jackie.hu...@windriver.com>
---
meta/classes/syslinux.bbclass | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index 501bc6d..a9eba59 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -40,9 +40,9 @@ syslinux_populate() {
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}/${datadir}/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}/${datadir}/syslinux/vesamenu.c32
${ISODIR}${ISOLINUXDIR}/vesamenu.c32
if [ "${SYSLINUX_SPLASH}" != "" ] ; then
install -m 0644 ${SYSLINUX_SPLASH}
${ISODIR}${ISOLINUXDIR}/splash.lss
fi
@@ -51,9 +51,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}/${datadir}/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}/${datadir}/syslinux/vesamenu.c32
${HDDDIR}${SYSLINUXDIR}/vesamenu.c32
if [ "${SYSLINUX_SPLASH}" != "" ] ; then
install -m 0644 ${SYSLINUX_SPLASH}
${HDDDIR}${SYSLINUXDIR}/splash.lss
fi
--
1.7.4.1
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
