pull ldlinux.sys and isolinux.bin from correct places
PATCH 1/1 pull ldlinux.sys and isolinux.bin from correct places
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 <[email protected]>
--- meta/classes/syslinux.bbclass | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
meta/classes/syslinux.bbclass +4 -2
@@ -39,14 +39,16 @@ syslinux_populate() { fi } +# 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_LIBDIR}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR} + install -m 0644 ${STAGING_DIR}/${MACHINE}/${libdir}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR} } syslinux_hddimg_populate() { syslinux_populate ${HDDDIR} ${SYSLINUXDIR} syslinux.cfg - install -m 0444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}${SYSLINUXDIR}/ldlinux.sys + install -m 0444 ${STAGING_DIR}/${MACHINE}/${libdir}/syslinux/ldlinux.sys ${HDDDIR}${SYSLINUXDIR}/ldlinux.sys } syslinux_hddimg_install() {
Signature · 1 line
1.7.3.4