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>

diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 859d517dbd5011e3b6340f35435b5531765c805f..b1c03ba068aedac5cd91d281b53aec82411bf9b4 100644 (file)
--- 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