Remove hardcoded staging layout assumptions

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3117 311d38ba-8fff-0310-9ca6-ca027cbcb966

1 files changed, 2 insertions, 2 deletions

diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 2d64ec1fa9..0c96001096 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -41,7 +41,7 @@ build_boot_bin() {
                 install -m 0644 ${INITRD} ${HDDDIR}/initrd
         fi
 
-        install -m 444 ${STAGING_DIR}/${BUILD_SYS}/share/syslinux/ldlinux.sys \
+        install -m 444 ${STAGING_DATADIR_NATIVE}/syslinux/ldlinux.sys \
         ${HDDDIR}/ldlinux.sys
 
         # Do a little math, bash style
@@ -75,7 +75,7 @@ build_boot_bin() {
                 install -m 0644 ${INITRD} ${ISODIR}/initrd
 
                 # And install the syslinux stuff 
-                cp ${STAGING_DIR}/${BUILD_SYS}/share/syslinux/isolinux.bin \
+                cp ${STAGING_DATADIR_NATIVE}/syslinux/isolinux.bin \
                 ${ISODIR}
 
                 mkisofs -V ${BOOTIMG_VOLUME_ID} \