diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-20 11:19:51 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-21 12:37:18 +0000 |
| commit | 40e83470ca45ae5c305609a5065278612e69a7e2 (patch) | |
| tree | 9ad676c5e78d187622d36063174f5e9dba30f6fe | |
| parent | 75f83fdc5a78bf1b84dbcd6acb9fa3f76b2aac2c (diff) | |
| download | openembedded-core-40e83470ca45ae5c305609a5065278612e69a7e2.tar.gz openembedded-core-40e83470ca45ae5c305609a5065278612e69a7e2.tar.bz2 openembedded-core-40e83470ca45ae5c305609a5065278612e69a7e2.zip | |
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>
| -rw-r--r-- | meta/classes/boot-directdisk.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass index 09da032049..44f738b02e 100644 --- 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 |