boot-directdisk fixes for bernard

From: Tom Zanussi <[email protected]>

Please pull into poky/bernard.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: tzanussi/bug-876-bernard
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=tzanussi/bug-876-bernard

Thanks,
Tom Zanussi <[email protected]>
---

Tom Zanussi (2):
core-image-directdisk: add LIC_FILES_CHECKSUM
boot-directdisk: fix bzImage source location

 meta/classes/boot-directdisk.bbclass               |    2 +-
 meta/recipes-core/images/poky-image-directdisk.inc |    3 +++
 2 files changed, 4 insertions(+), 1 deletions(-)

From: Tom Zanussi <[email protected]>

Fix for build failure.

---
 meta/recipes-core/images/poky-image-directdisk.inc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

index 64144b9..42e5e14 100644
@@ -1,5 +1,8 @@
 inherit boot-directdisk
 
+LIC_FILES_CHKSUM = "file://${POKYBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
+                    file://${POKYBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
+
 do_bootdirectdisk_prepend () {
 	import bb
 	fstypes = bb.data.getVar('IMAGE_FSTYPES', d, True)

1.7.0.4

From: Tom Zanussi <[email protected]>

Fixes yocto [BUGID #876]

boot-directdisk.class looks in the wrong location for the bzImage to install. Make it look in the right place.

---
 meta/classes/boot-directdisk.bbclass |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

index d87dc22..8879ba8 100644
@@ -49,7 +49,7 @@ build_boot_dd() {
 	IMAGE=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.hdddirect
 
 	install -d ${HDDDIR}
-	install -m 0644 ${STAGING_DIR}/${MACHINE}${HOST_VENDOR}-${HOST_OS}/kernel/bzImage ${HDDDIR}/vmlinuz
+	install -m 0644 ${STAGING_DIR_HOST}/kernel/bzImage ${HDDDIR}/vmlinuz
 	install -m 444 ${STAGING_LIBDIR}/syslinux/ldlinux.sys ${HDDDIR}/ldlinux.sys
 
 	BLOCKS=`du -bks ${HDDDIR} | cut -f 1`

1.7.0.4