[oe-commits] Darren Hart : bootimg: Use STAGING_KERNEL_DIR

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: denzil
Commit: 032bd9a856f9ca0b43dff272bd4f95481aa46597
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=032bd9a856f9ca0b43dff272bd4f95481aa46597

Author: Darren Hart <dvhart at linux.intel.com>
Date:   Thu Jul  5 11:08:59 2012 -0700

bootimg: Use STAGING_KERNEL_DIR

bootimg.bbclass using STAGING_DIR_HOST/kernel instead of
STAGING_KERNEL_DIR, resulting in build failure of live images.

| install: cannot stat `/usr/local/dev/yocto/fishriver-test/build/tmp/sysroots/fishriver/kernel/bzImage': No such file or directory

Replace it with STAGING_KERNEL_DIR.

(From OE-Core rev: 8f16811a8d51982a8b3d70e6087aef4a41926840)

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
Tested-by: Tom Zanussi <tom.zanussi at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

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

diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index f4981d8..d4e2a57 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -63,7 +63,7 @@ populate() {
 	install -d ${DEST}
 
 	# Install bzImage, initrd, and rootfs.img in DEST for all loaders to use.
-	install -m 0644 ${STAGING_DIR_HOST}/kernel/bzImage ${DEST}/vmlinuz
+	install -m 0644 ${STAGING_KERNEL_DIR}/bzImage ${DEST}/vmlinuz
 
 	if [ -n "${INITRD}" ] && [ -s "${INITRD}" ]; then
 		install -m 0644 ${INITRD} ${DEST}/initrd