[oe-commits] Richard Purdie : bootimg: Use deploy artefacts, not STAGING_KERNEL_DIR
git at git.openembedded.org
git at git.openembedded.org
Sat Dec 20 11:24:51 UTC 2014
Module: openembedded-core.git
Branch: master-next
Commit: 66d8640e1a61e91b2f05e919015a69540a8004c0
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=66d8640e1a61e91b2f05e919015a69540a8004c0
Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date: Fri Dec 19 17:46:59 2014 +0000
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 at linuxfoundation.org>
---
meta/classes/bootimg.bbclass | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass
index 859d517..b1c03ba 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
More information about the Openembedded-commits
mailing list