From 24c464744901765d1a0f03b2d95b2f8e7f5a4662 Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Wed, 7 Apr 2021 16:37:11 +0200 Subject: enea-nfv-access: Add hddimg IMG_FSTYPE before includes Adding IMG_FSTYPES += "hddimg" must be done before inheriting core-image (in enea-image-common.inc) to avoid parsing errors. Further, override_grub-efi_secureboot.inc overrides some functions brought in by adding hddimg image type, so adding it after the include would render the override useless. Change-Id: Id87fc69c5dd5d0de953fbe014f639d382c3714e8 Signed-off-by: Adrian Dudau --- images/enea-nfv-access-host-common.inc | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'images') diff --git a/images/enea-nfv-access-host-common.inc b/images/enea-nfv-access-host-common.inc index c0cd896..6b9c99e 100644 --- a/images/enea-nfv-access-host-common.inc +++ b/images/enea-nfv-access-host-common.inc @@ -1,3 +1,5 @@ +IMAGE_FSTYPES += "hddimg" + REQUIRE_FILES = " \ images/enea-nfv-access-common.inc \ classes/override_grub-efi.inc \ @@ -14,12 +16,6 @@ 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" -- cgit v1.2.3-54-g00ecf