vcontainer: fix yocto-check-layer mcdepends parse error

Fix yocto-check-layer failure:

  ERROR: Multiconfig dependency mc::vruntime-x86-64:vpdmn-initramfs-create:do_deploy
  depends on nonexistent multiconfig configuration named configuration vruntime-x86-64

Several recipes and classes declared static mcdepends referencing
vruntime-aarch64 and vruntime-x86-64 multiconfigs. When parsed without
BBMULTICONFIG set (e.g. yocto-check-layer), BitBake validates these and
fails because the referenced multiconfigs don't exist.

Move mcdepends into anonymous python functions and only set them when
the target multiconfig exists in BBMULTICONFIG, following the pattern
established in meta/classes-recipe/kernel-fit-image.bbclass.

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

1 files changed, 8 insertions, 5 deletions

diff --git a/classes/container-cross-install.bbclass b/classes/container-cross-install.bbclass
index 2ae25d9b..05a40abb 100644
--- a/classes/container-cross-install.bbclass
+++ b/classes/container-cross-install.bbclass
@@ -144,17 +144,20 @@ DEPENDS += "vcontainer-native coreutils-native"
 VRUNTIME_MULTICONFIG = "${@get_vruntime_multiconfig(d)}"
 VRUNTIME_MACHINE = "${@get_vruntime_machine(d)}"
 
-# Use mcdepends to automatically build vdkr/vpdmn blobs via multiconfig
-# This ensures blobs are built as part of the normal Yocto build flow
-# Requires BBMULTICONFIG = "vruntime-aarch64 vruntime-x86-64" in local.conf
-do_rootfs[mcdepends] = "mc::${VRUNTIME_MULTICONFIG}:vdkr-initramfs-create:do_deploy mc::${VRUNTIME_MULTICONFIG}:vpdmn-initramfs-create:do_deploy"
-
 # Generate dependencies for BUNDLED_CONTAINERS at parse time
 # Format: name:runtime[:autostart][:external]
 # - If :external present, no dependency generated (third-party blob)
 # - If name ends in -oci, derive recipe name and generate dependency
 # - Otherwise, generate dependency on name:do_image_complete
 python __anonymous() {
+    # Conditionally set mcdepends when vruntime multiconfig is configured
+    # (avoids parse errors when BBMULTICONFIG is not set, e.g. yocto-check-layer)
+    vruntime_mc = d.getVar('VRUNTIME_MULTICONFIG')
+    bbmulticonfig = (d.getVar('BBMULTICONFIG') or "").split()
+    if vruntime_mc and vruntime_mc in bbmulticonfig:
+        d.setVarFlag('do_rootfs', 'mcdepends',
+            'mc::%s:vdkr-initramfs-create:do_deploy mc::%s:vpdmn-initramfs-create:do_deploy' % (vruntime_mc, vruntime_mc))
+
     bundled = (d.getVar('BUNDLED_CONTAINERS') or "").split()
     if not bundled:
         return