Merge branch 'feature_CPDX-3405'

Change-Id: I1b1576f01045d4be17a18fe5f4a8fb612d38113a

1 files changed, 11 insertions, 1 deletions

diff --git a/conf/distro/eneanfvaccess.conf b/conf/distro/eneanfvaccess.conf
index ed7383e..608c103 100644
--- a/conf/distro/eneanfvaccess.conf
+++ b/conf/distro/eneanfvaccess.conf
@@ -7,14 +7,24 @@ DISTRO_VERSION = "${DISTRO_VERSION_MAJOR}${DISTRO_VERSION_MINOR}"
 
 SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
+# OSTree integration
+require ${@bb.utils.contains('SOTA_MACHINE', '${MACHINE}', 'conf/distro/sota.conf.inc', '', d)}
+
 INHERIT += "distrooverrides"
-DISTRO_FEATURES_append = " odm efi-secure-boot"
+DISTRO_FEATURES_append = " odm efi-secure-boot usrmerge"
 DISTRO_FEATURES_OVERRIDES += "odm efi-secure-boot"
 
 PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native"
 PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
 PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
 
+# Override ESP mount path set by meta/conf/image-uefi.conf to align with meta-secure-core paths
+EFI_PREFIX_df-efi-secure-boot = "/boot/efi"
 SBFOLDER = "bootloader"
 
 HOSTTOOLS_append = " scp"
+
+BB_HASHBASE_WHITELIST_append += "\
+    SAMPLE_UEFI_SB_KEYS_DIR \
+    SAMPLE_BOOT_KEYS_DIR \
+"