summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2012-07-05 11:08:59 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-06 09:39:23 +0100
commitd9302305faf4ec733dc9a98f91f5014eb814d62d (patch)
treeda4e40e6dc7c0f64792d89a57cd48122c9315a4a
parentb0510e547ebcac5548b36df66ad907f7911d33d5 (diff)
downloadpoky-d9302305faf4ec733dc9a98f91f5014eb814d62d.tar.gz
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@linux.intel.com> Tested-by: Tom Zanussi <tom.zanussi@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/bootimg.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 370b3786f2..a4c0e8d931 100644
--- a/meta/classes/bootimg.bbclass
+++ b/meta/classes/bootimg.bbclass
@@ -63,7 +63,7 @@ populate() {
63 install -d ${DEST} 63 install -d ${DEST}
64 64
65 # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use. 65 # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use.
66 install -m 0644 ${STAGING_DIR_HOST}/kernel/bzImage ${DEST}/vmlinuz 66 install -m 0644 ${STAGING_KERNEL_DIR}/bzImage ${DEST}/vmlinuz
67 67
68 if [ -n "${INITRD}" ] && [ -s "${INITRD}" ]; then 68 if [ -n "${INITRD}" ] && [ -s "${INITRD}" ]; then
69 install -m 0644 ${INITRD} ${DEST}/initrd 69 install -m 0644 ${INITRD} ${DEST}/initrd