bootimg: Use deploy artefacts, not STAGING_KERNEL_DIR

PATCH New Richard Purdie 1 participant 1 message Dec 19, 2014

Share & tools

Richard Purdie

author

2014-12-19 17:47 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

meta/classes/bootimg.bbclass +2 -1

index 8a305af..003816b 100644
@@ -30,6 +30,7 @@ NONGLOBALBBCLASS += "bootimg"
 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 = " "

@@ -68,7 +69,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