[v2] image_types: fix default location of kernel when generating elf images

Submitted by Tomas Frydrych on May 3, 2013, 11:39 a.m.

Details

Message ID 1367581142-4756-1-git-send-email-tf+lists.yocto@r-finger.com
State New
Headers show

Commit Message

Tomas Frydrych May 3, 2013, 11:39 a.m.
From: Tomas Frydrych <tomas@sleepfive.com>

The kernel image is no longer staged into sysroot, so building of elf images
fails  due to the kernel not being found. Thi commit fixes this by locating
the appropriate (i.e., machine-specific) kernel in the DEPLOY_DIR_IMAGE
directory instead.

Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
 meta/classes/image_types.bbclass |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 98d31f5..0e1ad3a 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -185,7 +185,7 @@  IMAGE_CMD_cpio () {
 	cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio)
 }
 
-ELF_KERNEL ?= "${STAGING_DIR_HOST}/kernel/${KERNEL_IMAGETYPE}"
+ELF_KERNEL ?= "${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin"
 ELF_APPEND ?= "ramdisk_size=32768 root=/dev/ram0 rw console="
 
 IMAGE_CMD_elf () {