1 files changed, 8 insertions, 4 deletions

diff --git a/images/enea-nfv-access-host-common.inc b/images/enea-nfv-access-host-common.inc
index 1cde827..c0cd896 100644
--- a/images/enea-nfv-access-host-common.inc
+++ b/images/enea-nfv-access-host-common.inc
@@ -3,8 +3,6 @@ REQUIRE_FILES = " \
     classes/override_grub-efi.inc \
     "
 REQUIRE_FILES_append_df-efi-secure-boot = " \
-    classes/override_image_types_ostree.inc \
-    classes/override_image_types_ota.inc \
     classes/override_grub-efi_secureboot.inc \
     images/secure-boot.inc \
     "
@@ -16,6 +14,12 @@ IMAGE_INSTALL += " \
     packagegroup-enea-virtualization-4gusb-modems \
     "
 
+#This should not be needed, it's a hack. Without it it complains hddimg is not recognize
+#See image.bbclass +13.
+#inherit image-live
+
+IMAGE_FSTYPES += "hddimg"
+
 # Set labels for GRUB and SYSLINUX
 LABELS_LIVE = "installer live-boot"
 
@@ -30,13 +34,13 @@ AUTO_SYSLINUXMENU_x86-64 = "0"
 
 # grub-efi-native is needed in recipe-sysroot-native to generate the initial
 # configuration file for grub
-DEPENDS_append += " grub-efi-native"
+DEPENDS_append += " grub-efi-native qemuwrapper-cross"
 
 # If building with sota enabled, build the otaimg before the hddimg, because
 # the hddimg needs it as a base image
 python __anonymous() {
     if bb.utils.contains('DISTRO_FEATURES', 'sota', True, False, d):
-        d.appendVarFlag("do_bootimg", "depends", " %s:do_image_otaimg" % d.getVar("IMAGE_BASENAME", True))
+        d.appendVarFlag("do_bootimg", "depends", " %s:do_image_ota_ext4" % d.getVar("IMAGE_BASENAME", True))
 }
 
 # Append OSTree specific parameters to the kernel command line before creating the live image