boot-directdisk: Use kernel from DEPLOY_DIR_IMAGE, not sysroot

After the recent kernel changes, this avoids failures like:

DEBUG: Executing shell function build_boot_dd
install: cannot stat '/home/pokybuild/yocto-autobuilder/yocto-worker/build-appliance/build/build/tmp/sysroots/qemux86-64/usr/src/kernel/bzImage': No such file or directory
WARNING: exit code 1 from a shell command.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index 09da0320490b1693ba6018a6e36e2ca9a3491d27..44f738b02ed3d1df15646ce8268048755034ce36 100644 (file)
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -20,6 +20,7 @@
 # ${ROOTFS} - the rootfs image to incorporate
 
 do_bootdirectdisk[depends] += "dosfstools-native:do_populate_sysroot \
+                               virtual/kernel:do_deploy \
                                syslinux:do_populate_sysroot \
                                syslinux-native:do_populate_sysroot \
                                parted-native:do_populate_sysroot \
@@ -69,7 +70,7 @@ boot_direct_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