summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorTomas Frydrych <tomas@sleepfive.com>2013-05-03 13:18:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-22 17:14:00 +0100
commit28be9becfb0c61d7b9872d5178ffeaa44fa376b8 (patch)
tree5e0e2cf80b7f2ed38f7f4078c9536cebae3e6b67 /meta
parenta21415db4e907b3eb7623eb4cb69fde724594107 (diff)
downloadpoky-28be9becfb0c61d7b9872d5178ffeaa44fa376b8.tar.gz
image_types: fix default location of kernel when generating elf images
Generation of elf images fails because kernel images are no longer staged under ${STAGING_DIR_HOST}/kernel, but rather ${STAGING_DIR_HOST}/usr/src/kernel. This patch fixes the path to point to the correct location. (From OE-Core master rev: 6e57a3231fb29f869d476b8511d6f4393f82651b) (From OE-Core rev: 54a7691a3efce3d7a154233345b5f6b161fd71bf) Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image_types.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index 98d31f5bfb..94837ae0a8 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -185,7 +185,7 @@ IMAGE_CMD_cpio () {
185 cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) 185 cd ${IMAGE_ROOTFS} && (find . | cpio -o -H newc >${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio)
186} 186}
187 187
188ELF_KERNEL ?= "${STAGING_DIR_HOST}/kernel/${KERNEL_IMAGETYPE}" 188ELF_KERNEL ?= "${STAGING_DIR_HOST}/usr/src/kernel/${KERNEL_IMAGETYPE}"
189ELF_APPEND ?= "ramdisk_size=32768 root=/dev/ram0 rw console=" 189ELF_APPEND ?= "ramdisk_size=32768 root=/dev/ram0 rw console="
190 190
191IMAGE_CMD_elf () { 191IMAGE_CMD_elf () {