vcontainer-initramfs-create: fix kernel path for multiconfig builds

The kernel was copied from DEPLOY_DIR_IMAGE which resolves to the main
build config's deploy directory — not the multiconfig's. On autobuilder
setups with sstate, this caused the kernel to be missing from the vdkr
blob directory because:

1. The mcdepends (mc:<mc>::virtual/kernel:do_deploy) depended on the
   main config's kernel, which may be a different architecture
2. DEPLOY_DIR_IMAGE pointed to the main deploy dir, not the
   multiconfig's tmp-vruntime-<arch>/deploy/images/<machine>/

Fix by using MC_DEPLOY (the multiconfig's deploy directory) for the
kernel path, consistent with how initramfs and rootfs are already
copied. Remove the cross-multiconfig mcdepends since the kernel is
built as a transitive dependency of the rootfs image within the same
multiconfig.

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

1 files changed, 12 insertions, 8 deletions

diff --git a/recipes-containers/vcontainer/vcontainer-initramfs-create.inc b/recipes-containers/vcontainer/vcontainer-initramfs-create.inc
index 3e22bdb1..1a22c3d4 100644
--- a/recipes-containers/vcontainer/vcontainer-initramfs-create.inc
+++ b/recipes-containers/vcontainer/vcontainer-initramfs-create.inc
@@ -44,12 +44,12 @@ python () {
         d.setVarFlag('do_compile', 'nostamp', '1')
         d.setVarFlag('do_deploy', 'nostamp', '1')
 
-    # Conditionally set mcdepends when our multiconfig is configured
-    # (avoids parse errors when BBMULTICONFIG is not set, e.g. yocto-check-layer)
-    mc = d.getVar('VCONTAINER_MULTICONFIG')
-    bbmulticonfig = (d.getVar('BBMULTICONFIG') or "").split()
-    if mc in bbmulticonfig:
-        d.setVarFlag('do_compile', 'mcdepends', 'mc:%s::virtual/kernel:do_deploy' % mc)
+    # 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
@@ -141,14 +141,18 @@ do_compile() {
     # =========================================================================
     # PART 3: COPY KERNEL
     # =========================================================================
+    # Use the multiconfig's deploy directory (same as initramfs/rootfs),
+    # not DEPLOY_DIR_IMAGE which may point to the main config's deploy
+    # directory. The kernel is built as a dependency of the rootfs image
+    # within the same multiconfig.
     bbnote "Copying kernel image..."
-    KERNEL_FILE="${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE_INITRAMFS}"
+    KERNEL_FILE="${MC_DEPLOY}/${KERNEL_IMAGETYPE_INITRAMFS}"
     if [ -f "${KERNEL_FILE}" ]; then
         cp "${KERNEL_FILE}" ${B}/kernel
         KERNEL_SIZE=$(stat -c%s ${B}/kernel)
         bbnote "Kernel copied: ${KERNEL_SIZE} bytes ($(expr ${KERNEL_SIZE} / 1024 / 1024)MB)"
     else
-        bbwarn "Kernel not found at ${KERNEL_FILE}"
+        bbwarn "Kernel not found at ${KERNEL_FILE} — check that the vruntime multiconfig kernel is built"
     fi
 }