image-oci-umoci: create usrmerge symlinks in multi-layer mode

ROOTFS_PREPROCESS_COMMAND creates usrmerge symlinks (/bin -> usr/bin,
etc.) during do_rootfs, but multi-layer OCI mode installs packages
to separate layer rootfs directories that bypass this step. Call the
existing create_merged_usr_symlinks function on the first packages
layer to fix this.

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

1 files changed, 10 insertions, 0 deletions

diff --git a/classes/image-oci-umoci.inc b/classes/image-oci-umoci.inc
index eeb41ca5..bad6c5d0 100644
--- a/classes/image-oci-umoci.inc
+++ b/classes/image-oci-umoci.inc
@@ -584,6 +584,16 @@ IMAGE_CMD:oci() {
                     bbnote "OCI: Copying pre-installed packages from $oci_preinstall_rootfs"
                     # Use rsync to merge into bundle rootfs (handles symlinks properly)
                     rsync -a --no-owner --no-group "$oci_preinstall_rootfs/" "$image_bundle_name/rootfs/"
+
+                    # Create usrmerge symlinks in the first packages layer.
+                    # Normally done by ROOTFS_PREPROCESS_COMMAND in do_rootfs,
+                    # which doesn't run for multi-layer rootfs directories.
+                    if [ "$oci_pkg_layer_num" = "1" ]; then
+                        if ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'true', 'false', d)}; then
+                            bbnote "OCI: Creating usrmerge symlinks in first layer"
+                            create_merged_usr_symlinks "$image_bundle_name/rootfs"
+                        fi
+                    fi
                 else
                     bbwarn "OCI: Pre-installed rootfs not found at $oci_preinstall_rootfs"
                 fi