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-09-28 16:53:18 +0100
commitd567e770c33c4ff99221f30aa83ec34c46583e14 (patch)
treed03fe74332918091118fa05fac0ced7468b0b11b
parenta5f5b1e80a55331f612af5e15d21911ec354bead (diff)
downloadpoky-d567e770c33c4ff99221f30aa83ec34c46583e14.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) (From OE-Core rev: 032bd9a856f9ca0b43dff272bd4f95481aa46597) 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 f4981d8e37..d4e2a571d5 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