3 files changed, 58 insertions, 66 deletions

diff --git a/classes/container-bundle.bbclass b/classes/container-bundle.bbclass
index fdd241ee..406e70cc 100644
--- a/classes/container-bundle.bbclass
+++ b/classes/container-bundle.bbclass
@@ -157,45 +157,15 @@ def get_bundle_runtime(d):
 
 CONTAINER_BUNDLE_RUNTIME ?= "${@get_bundle_runtime(d)}"
 
+# Inherit shared functions for multiconfig/machine/arch mapping
+inherit container-common
+
 # Dependencies on native tools
 # vcontainer-native provides vrunner.sh
 # Blobs come from multiconfig builds (vdkr-initramfs-create, vpdmn-initramfs-create)
 DEPENDS += "qemuwrapper-cross qemu-system-native skopeo-native"
 DEPENDS += "vcontainer-native"
 
-# Determine multiconfig name for blob building based on target architecture
-def get_vruntime_multiconfig(d):
-    arch = d.getVar('TARGET_ARCH')
-    if arch == 'aarch64':
-        return 'vruntime-aarch64'
-    elif arch in ['x86_64', 'i686', 'i586']:
-        return 'vruntime-x86-64'
-    else:
-        return None
-
-# Get the MACHINE name used in the multiconfig (for deploy path)
-def get_vruntime_machine(d):
-    arch = d.getVar('TARGET_ARCH')
-    if arch == 'aarch64':
-        return 'qemuarm64'
-    elif arch in ['x86_64', 'i686', 'i586']:
-        return 'qemux86-64'
-    else:
-        return None
-
-# Map TARGET_ARCH to blob directory name (aarch64, x86_64)
-def get_blob_arch(d):
-    """Map Yocto TARGET_ARCH to blob directory name"""
-    arch = d.getVar('TARGET_ARCH')
-    blob_map = {
-        'aarch64': 'aarch64',
-        'arm': 'aarch64',  # Use aarch64 blobs for 32-bit ARM too
-        'x86_64': 'x86_64',
-        'i686': 'x86_64',
-        'i586': 'x86_64',
-    }
-    return blob_map.get(arch, 'aarch64')
-
 VRUNTIME_MULTICONFIG = "${@get_vruntime_multiconfig(d)}"
 VRUNTIME_MACHINE = "${@get_vruntime_machine(d)}"
 BLOB_ARCH = "${@get_blob_arch(d)}"
diff --git a/classes/container-common.bbclass b/classes/container-common.bbclass
new file mode 100644
index 00000000..21c8e998
--- /dev/null
+++ b/classes/container-common.bbclass
@@ -0,0 +1,51 @@
+# SPDX-FileCopyrightText: Copyright (C) 2025 Bruce Ashfield
+#
+# SPDX-License-Identifier: MIT
+#
+# container-common.bbclass
+# ===========================================================================
+# Shared functions for container bundling and cross-installation
+# ===========================================================================
+#
+# This class provides common helper functions used by both:
+#   - container-bundle.bbclass
+#   - container-cross-install.bbclass
+#
+# These functions map target architecture to multiconfig names, machine names,
+# and blob directory names used by vdkr/vpdmn.
+
+# Determine multiconfig name for blob building based on target architecture
+# Returns the multiconfig name (e.g., 'vruntime-aarch64' or 'vruntime-x86-64')
+def get_vruntime_multiconfig(d):
+    arch = d.getVar('TARGET_ARCH')
+    if arch == 'aarch64':
+        return 'vruntime-aarch64'
+    elif arch in ['x86_64', 'i686', 'i586']:
+        return 'vruntime-x86-64'
+    else:
+        return None
+
+# Get the MACHINE name used in the multiconfig (for deploy path)
+# Returns the machine name (e.g., 'qemuarm64' or 'qemux86-64')
+def get_vruntime_machine(d):
+    arch = d.getVar('TARGET_ARCH')
+    if arch == 'aarch64':
+        return 'qemuarm64'
+    elif arch in ['x86_64', 'i686', 'i586']:
+        return 'qemux86-64'
+    else:
+        return None
+
+# Map TARGET_ARCH to blob directory name (aarch64, x86_64)
+# The blob directories contain pre-built kernel and initramfs for vdkr/vpdmn
+def get_blob_arch(d):
+    """Map Yocto TARGET_ARCH to blob directory name"""
+    arch = d.getVar('TARGET_ARCH')
+    blob_map = {
+        'aarch64': 'aarch64',
+        'arm': 'aarch64',  # Use aarch64 blobs for 32-bit ARM too
+        'x86_64': 'x86_64',
+        'i686': 'x86_64',
+        'i586': 'x86_64',
+    }
+    return blob_map.get(arch, 'aarch64')
diff --git a/classes/container-cross-install.bbclass b/classes/container-cross-install.bbclass
index d6a38dad..e0fc63da 100644
--- a/classes/container-cross-install.bbclass
+++ b/classes/container-cross-install.bbclass
@@ -100,32 +100,15 @@
 #
 # See also: container-bundle.bbclass
 
+# Inherit shared functions for multiconfig/machine/arch mapping
+inherit container-common
+
 # Dependencies on native tools
 # vcontainer-native provides vrunner.sh
 # Blobs come from multiconfig builds (vdkr-initramfs-create, vpdmn-initramfs-create)
 DEPENDS += "qemuwrapper-cross qemu-system-native skopeo-native"
 DEPENDS += "vcontainer-native coreutils-native"
 
-# Determine multiconfig name for blob building based on target architecture
-def get_vruntime_multiconfig(d):
-    arch = d.getVar('TARGET_ARCH')
-    if arch == 'aarch64':
-        return 'vruntime-aarch64'
-    elif arch in ['x86_64', 'i686', 'i586']:
-        return 'vruntime-x86-64'
-    else:
-        return None
-
-# Get the MACHINE name used in the multiconfig (for deploy path)
-def get_vruntime_machine(d):
-    arch = d.getVar('TARGET_ARCH')
-    if arch == 'aarch64':
-        return 'qemuarm64'
-    elif arch in ['x86_64', 'i686', 'i586']:
-        return 'qemux86-64'
-    else:
-        return None
-
 VRUNTIME_MULTICONFIG = "${@get_vruntime_multiconfig(d)}"
 VRUNTIME_MACHINE = "${@get_vruntime_machine(d)}"
 
@@ -213,19 +196,7 @@ def get_kernel_name(d):
 
 KERNEL_IMAGETYPE_QEMU = "${@get_kernel_name(d)}"
 
-# Map TARGET_ARCH to blob directory name (aarch64, x86_64)
-def get_blob_arch(d):
-    """Map Yocto TARGET_ARCH to blob directory name"""
-    arch = d.getVar('TARGET_ARCH')
-    blob_map = {
-        'aarch64': 'aarch64',
-        'arm': 'aarch64',  # Use aarch64 blobs for 32-bit ARM too
-        'x86_64': 'x86_64',
-        'i686': 'x86_64',
-        'i586': 'x86_64',
-    }
-    return blob_map.get(arch, 'aarch64')
-
+# BLOB_ARCH uses get_blob_arch() from container-common.bbclass
 BLOB_ARCH = "${@get_blob_arch(d)}"
 
 # ============================================================================