summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-19 17:46:59 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-21 12:37:55 +0000
commitc5236d723fc9f9856f4d3e346734928a7305bcea (patch)
treef480572e4007db2aa9821c68d6bcc3741344fdf6 /meta/classes
parent1dd37a2a9960ad26e27567d1871d78bec336e1a2 (diff)
downloadpoky-c5236d723fc9f9856f4d3e346734928a7305bcea.tar.gz
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. (From OE-Core rev: 75f83fdc5a78bf1b84dbcd6acb9fa3f76b2aac2c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/bootimg.bbclass3
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 @@
28do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \ 28do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \
29 mtools-native:do_populate_sysroot \ 29 mtools-native:do_populate_sysroot \
30 cdrtools-native:do_populate_sysroot \ 30 cdrtools-native:do_populate_sysroot \
31 virtual/kernel:do_deploy \
31 ${@oe.utils.ifelse(d.getVar('COMPRESSISO'),'zisofs-tools-native:do_populate_sysroot','')}" 32 ${@oe.utils.ifelse(d.getVar('COMPRESSISO'),'zisofs-tools-native:do_populate_sysroot','')}"
32 33
33PACKAGES = " " 34PACKAGES = " "
@@ -66,7 +67,7 @@ populate() {
66 install -d ${DEST} 67 install -d ${DEST}
67 68
68 # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use. 69 # Install bzImage, initrd, and rootfs.img in DEST for all loaders to use.
69 install -m 0644 ${STAGING_KERNEL_DIR}/bzImage ${DEST}/vmlinuz 70 install -m 0644 ${DEPLOY_DIR_IMAGE}/bzImage ${DEST}/vmlinuz
70 71
71 # initrd is made of concatenation of multiple filesystem images 72 # initrd is made of concatenation of multiple filesystem images
72 if [ -n "${INITRD}" ]; then 73 if [ -n "${INITRD}" ]; then