diff options
author | Adrian Dudau <adrian.dudau@enea.com> | 2021-04-07 16:37:11 +0200 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2021-04-08 11:54:42 +0200 |
commit | 24c464744901765d1a0f03b2d95b2f8e7f5a4662 (patch) | |
tree | 5f5d6b8f70ce5728ece3bc8ada5e854260b42de1 | |
parent | 5f980c14dafb466e1d71e0b6e7487aa522ade9f9 (diff) | |
download | meta-el-nfv-access-24c464744901765d1a0f03b2d95b2f8e7f5a4662.tar.gz |
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 <adrian.dudau@enea.com>
-rw-r--r-- | images/enea-nfv-access-host-common.inc | 8 |
1 files changed, 2 insertions, 6 deletions
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 @@ | |||
1 | IMAGE_FSTYPES += "hddimg" | ||
2 | |||
1 | REQUIRE_FILES = " \ | 3 | REQUIRE_FILES = " \ |
2 | images/enea-nfv-access-common.inc \ | 4 | images/enea-nfv-access-common.inc \ |
3 | classes/override_grub-efi.inc \ | 5 | classes/override_grub-efi.inc \ |
@@ -14,12 +16,6 @@ IMAGE_INSTALL += " \ | |||
14 | packagegroup-enea-virtualization-4gusb-modems \ | 16 | packagegroup-enea-virtualization-4gusb-modems \ |
15 | " | 17 | " |
16 | 18 | ||
17 | #This should not be needed, it's a hack. Without it it complains hddimg is not recognize | ||
18 | #See image.bbclass +13. | ||
19 | #inherit image-live | ||
20 | |||
21 | IMAGE_FSTYPES += "hddimg" | ||
22 | |||
23 | # Set labels for GRUB and SYSLINUX | 19 | # Set labels for GRUB and SYSLINUX |
24 | LABELS_LIVE = "installer live-boot" | 20 | LABELS_LIVE = "installer live-boot" |
25 | 21 | ||