image/populate_sdk: Support usrmerge for nativesdk in SDK builds

Some recipes(systemd) requires usrmerge. Create the required symlinks for `/bin`, `/lib` and `/sbin`, when installing nativesdk packages. Enable the symlink creation by setting the `usrmerge` flag in DISTRO_FEATURES_NATIVESDK. (From OE-Core rev: 5f46717d2fdc738ba273f29edec7355864cc816c) Signed-off-by: Sean Nyekjaer <[email protected]> Signed-off-by: Mathieu Dubois-Briand <[email protected]>
distro-core-curated-mirrors · Jan 23, 2025 · d25fbb2 · d25fbb2
1 parent 53a92c2
commit d25fbb2
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/meta/classes-recipe/populate_sdk_base.bbclass b/meta/classes-recipe/populate_sdk_base.bbclass
@@ -200,7 +200,14 @@ create_merged_usr_symlinks_sdk() {
     create_merged_usr_symlinks ${SDK_OUTPUT}${SDKTARGETSYSROOT}
 }
 
-POPULATE_SDK_PRE_TARGET_COMMAND += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'create_merged_usr_symlinks_sdk', '',d)}"
+create_merged_usr_symlinks_nativesdk() {
+    create_merged_usr_symlinks ${SDK_OUTPUT}${SDKPATHNATIVE}
+}
+
+POPULATE_SDK_PRE_TARGET_COMMAND += " \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', 'create_merged_usr_symlinks_sdk', '',d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES_NATIVESDK', 'usrmerge', 'create_merged_usr_symlinks_nativesdk', '',d)} \
+"
 
 SDK_PACKAGING_COMMAND = "${@'${SDK_PACKAGING_FUNC}' if '${SDK_PACKAGING_FUNC}' else ''}"
 SDK_POSTPROCESS_COMMAND = "create_sdk_files check_sdk_sysroots archive_sdk ${SDK_PACKAGING_COMMAND}"