From f89cd3158a95890e15c97de4009e688bee8bc087 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 25 Mar 2010 14:09:06 +0000
Subject: [PATCH] bootimg/boot-directdisk.bbclass: Update afer syslinux
 changes, fix mbr.bin location and fix dependencies

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/classes/boot-directdisk.bbclass | 10 ++++++----
 meta/classes/bootimg.bbclass         |  6 ++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index f4abae991b..d87dc2258a 100644
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -20,8 +20,10 @@
 # ${ROOTFS} - the rootfs image to incorporate
 
 do_bootdirectdisk[depends] += "dosfstools-native:do_populate_sysroot \
-                       syslinux:do_populate_sysroot \
-                       syslinux-installer-native:do_populate_sysroot"
+                               syslinux:do_populate_sysroot \
+                               syslinux-native:do_populate_sysroot \
+                               parted-native:do_populate_sysroot \
+                               mtools-native:do_populate_sysroot "
 
 PACKAGES = " "
 EXCLUDE_FROM_WORLD = "1"
@@ -48,7 +50,7 @@ build_boot_dd() {
 
 	install -d ${HDDDIR}
 	install -m 0644 ${STAGING_DIR}/${MACHINE}${HOST_VENDOR}-${HOST_OS}/kernel/bzImage ${HDDDIR}/vmlinuz
-	install -m 444 ${STAGING_DATADIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys
+	install -m 444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys
 
 	BLOCKS=`du -bks ${HDDDIR} | cut -f 1`
 	SIZE=`expr $BLOCKS + ${BOOTDD_EXTRA_SPACE}`
@@ -74,7 +76,7 @@ build_boot_dd() {
 	parted $IMAGE print
 
 	OFFSET=`expr $END2 / 512`
-	dd if=/tmp/mbr.bin of=$IMAGE conv=notrunc
+	dd if=${STAGING_LIBDIR}/syslinux/mbr.bin of=$IMAGE conv=notrunc
 	dd if=${HDDIMG} of=$IMAGE conv=notrunc seek=1 bs=512
 	dd if=${ROOTFS} of=$IMAGE conv=notrunc seek=$OFFSET bs=512
 
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 2de8d50934..f1e2ba4b43 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -60,8 +60,7 @@ build_boot_bin() {
     		install -m 0644 ${ROOTFS} ${HDDDIR}/rootfs.img
 	fi
 
-	install -m 444 ${STAGING_DATADIR}/syslinux/ldlinux.sys \
-	${HDDDIR}/ldlinux.sys
+	install -m 444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys
 
 	# Do a little math, bash style
 	#BLOCKS=`du -s ${HDDDIR} | cut -f 1`
@@ -102,8 +101,7 @@ build_boot_bin() {
 		fi
 
 		# And install the syslinux stuff 
-		cp ${STAGING_DATADIR}/syslinux/isolinux.bin \
-		${ISODIR}
+		cp ${STAGING_LIBDIR}/syslinux/isolinux.bin ${ISODIR}
 
 		mkisofs -V ${BOOTIMG_VOLUME_ID} \
 		-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso \