diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-19 17:46:59 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-21 12:37:18 +0000 |
| commit | 75f83fdc5a78bf1b84dbcd6acb9fa3f76b2aac2c (patch) | |
| tree | 7f8639a7b256ffad76349fb6417e3a32fc3006b0 | |
| parent | 106dab2fd0321e6b4e77b40111e59a3a31d329d4 (diff) | |
| download | openembedded-core-75f83fdc5a78bf1b84dbcd6acb9fa3f76b2aac2c.tar.gz openembedded-core-75f83fdc5a78bf1b84dbcd6acb9fa3f76b2aac2c.tar.bz2 openembedded-core-75f83fdc5a78bf1b84dbcd6acb9fa3f76b2aac2c.zip | |
bootimg: Use deploy artefacts, not STAGING_KERNEL_DIR
bzImage is no longer in STAGING_KERNEL_DIR. Rather than add it back,
depend on the kernel deploy task and find it in DEPLOY_DIR_IMAGE.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/bootimg.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass index 859d517dbd..b1c03ba068 100644 --- a/meta/classes/bootimg.bbclass +++ b/meta/classes/bootimg.bbclass @@ -28,6 +28,7 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \ mtools-native:do_populate_sysroot \ cdrtools-native:do_populate_sysroot \ + virtual/kernel:do_deploy \ ${@oe.utils.ifelse(d.getVar('COMPRESSISO'),'zisofs-tools-native:do_populate_sysroot','')}" PACKAGES = " " @@ -66,7 +67,7 @@ populate() { install -d ${DEST} # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use. - install -m 0644 ${STAGING_KERNEL_DIR}/bzImage ${DEST}/vmlinuz + install -m 0644 ${DEPLOY_DIR_IMAGE}/bzImage ${DEST}/vmlinuz # initrd is made of concatenation of multiple filesystem images if [ -n "${INITRD}" ]; then |