2 files changed, 11 insertions, 5 deletions

diff --git a/conf/distro/eneanfvaccess.conf b/conf/distro/eneanfvaccess.conf
index a84e1a4..6026cf5 100644
--- a/conf/distro/eneanfvaccess.conf
+++ b/conf/distro/eneanfvaccess.conf
@@ -9,7 +9,7 @@ SDK_VERSION := "${@'${DISTRO_VERSION}'.replace('snapshot-${DATE}','snapshot')}"
 
 INHERIT += "distrooverrides"
 DISTRO_FEATURES_append = " odm"
-DISTRO_FEATURES_OVERRIDES += "odm"
+DISTRO_FEATURES_OVERRIDES += "odm efi-secure-boot"
 
 PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native"
 PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
diff --git a/images/enea-nfv-access-host-common.inc b/images/enea-nfv-access-host-common.inc
index 53cf7ad..e552168 100644
--- a/images/enea-nfv-access-host-common.inc
+++ b/images/enea-nfv-access-host-common.inc
@@ -1,7 +1,13 @@
-require images/enea-nfv-access-common.inc
-require classes/override_grub-efi.inc
-require classes/override_image_types_ostree.inc
-require images/secure-boot.inc
+REQUIRE_FILES = " \
+    images/enea-nfv-access-common.inc \
+    classes/override_grub-efi.inc \
+    "
+REQUIRE_FILES_append_df-efi-secure-boot = " \
+    classes/override_image_types_ostree.inc \
+    images/secure-boot.inc \
+    "
+
+require ${REQUIRE_FILES}
 
 IMAGE_INSTALL += " \
     packagegroup-enea-virtualization-host \