vcontainer-initramfs-create: fix kernel deploy dependency via do_build

On sstate-accelerated builds, the kernel binary (bzImage/Image) was
missing from MC_DEPLOY because do_compile depended on the image
recipes' do_image_complete, which runs before do_build. The kernel
deploy dependency (virtual/kernel:do_deploy) is attached to do_build
in image.bbclass, so depending on do_image_complete cut the chain
short and virtual/kernel:do_deploy was never guaranteed to have run.

Fix by depending on do_build instead of do_image_complete. The image
artifacts (cpio.gz, squashfs) are already in DEPLOY_DIR_IMAGE after
do_image_complete, so they remain available. do_build additionally
ensures virtual/kernel:do_deploy has completed, placing the kernel
in MC_DEPLOY for our do_compile to copy.

This avoids adding an explicit virtual/kernel:do_deploy dependency
which would couple this recipe to the kernel and prevent use cases
where the kernel is provided externally.

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>

1 files changed, 10 insertions, 11 deletions

diff --git a/recipes-containers/vcontainer/vcontainer-initramfs-create.inc b/recipes-containers/vcontainer/vcontainer-initramfs-create.inc
index 1a22c3d4..68011abc 100644
--- a/recipes-containers/vcontainer/vcontainer-initramfs-create.inc
+++ b/recipes-containers/vcontainer/vcontainer-initramfs-create.inc
@@ -44,12 +44,6 @@ python () {
         d.setVarFlag('do_compile', 'nostamp', '1')
         d.setVarFlag('do_deploy', 'nostamp', '1')
 
-    # The kernel is built as a dependency of the rootfs image within the
-    # same multiconfig — no cross-multiconfig mcdepends needed. The
-    # previous mcdepends on mc:<mc>::virtual/kernel:do_deploy was wrong
-    # because it depended on the main config's kernel (which may be a
-    # different architecture) and deployed to DEPLOY_DIR_IMAGE (main
-    # config), not MC_DEPLOY (multiconfig).
 }
 
 # Only populate native sysroot, skip target sysroot to avoid libgcc conflicts
@@ -58,12 +52,17 @@ INHIBIT_DEFAULT_DEPS = "1"
 # Dependencies:
 # 1. The tiny initramfs image (produces cpio.gz)
 # 2. The multiconfig rootfs image (produces squashfs)
-# 3. The kernel from main build
+# 3. The kernel (deployed transitively via image.bbclass do_build)
 #
-# Both initramfs and rootfs images are in the same multiconfig
-do_compile[depends] = "${VCONTAINER_RUNTIME}-tiny-initramfs-image:do_image_complete"
-do_compile[depends] += "${VCONTAINER_RUNTIME}-rootfs-image:do_image_complete"
-# mcdepends set conditionally in anonymous python below
+# Both image recipes inherit core-image/image.bbclass which has:
+#   do_build[depends] += "virtual/kernel:do_deploy"
+# By depending on do_build (not do_image_complete), we ensure the
+# kernel is deployed to MC_DEPLOY before do_compile copies it.
+# Using do_image_complete cut the chain short — it runs before
+# do_build, so virtual/kernel:do_deploy was not guaranteed to have
+# run, causing missing kernel on sstate-accelerated builds.
+do_compile[depends] = "${VCONTAINER_RUNTIME}-tiny-initramfs-image:do_build"
+do_compile[depends] += "${VCONTAINER_RUNTIME}-rootfs-image:do_build"
 
 S = "${UNPACKDIR}"
 B = "${WORKDIR}/build"