diff options
Diffstat (limited to 'images/enea-nfv-access-host-common.inc')
-rw-r--r-- | images/enea-nfv-access-host-common.inc | 12 |
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 = " \ | |||
3 | classes/override_grub-efi.inc \ | 3 | classes/override_grub-efi.inc \ |
4 | " | 4 | " |
5 | REQUIRE_FILES_append_df-efi-secure-boot = " \ | 5 | REQUIRE_FILES_append_df-efi-secure-boot = " \ |
6 | classes/override_image_types_ostree.inc \ | ||
7 | classes/override_image_types_ota.inc \ | ||
8 | classes/override_grub-efi_secureboot.inc \ | 6 | classes/override_grub-efi_secureboot.inc \ |
9 | images/secure-boot.inc \ | 7 | images/secure-boot.inc \ |
10 | " | 8 | " |
@@ -16,6 +14,12 @@ IMAGE_INSTALL += " \ | |||
16 | packagegroup-enea-virtualization-4gusb-modems \ | 14 | packagegroup-enea-virtualization-4gusb-modems \ |
17 | " | 15 | " |
18 | 16 | ||
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 | |||
19 | # Set labels for GRUB and SYSLINUX | 23 | # Set labels for GRUB and SYSLINUX |
20 | LABELS_LIVE = "installer live-boot" | 24 | LABELS_LIVE = "installer live-boot" |
21 | 25 | ||
@@ -30,13 +34,13 @@ AUTO_SYSLINUXMENU_x86-64 = "0" | |||
30 | 34 | ||
31 | # grub-efi-native is needed in recipe-sysroot-native to generate the initial | 35 | # grub-efi-native is needed in recipe-sysroot-native to generate the initial |
32 | # configuration file for grub | 36 | # configuration file for grub |
33 | DEPENDS_append += " grub-efi-native" | 37 | DEPENDS_append += " grub-efi-native qemuwrapper-cross" |
34 | 38 | ||
35 | # If building with sota enabled, build the otaimg before the hddimg, because | 39 | # If building with sota enabled, build the otaimg before the hddimg, because |
36 | # the hddimg needs it as a base image | 40 | # the hddimg needs it as a base image |
37 | python __anonymous() { | 41 | python __anonymous() { |
38 | if bb.utils.contains('DISTRO_FEATURES', 'sota', True, False, d): | 42 | if bb.utils.contains('DISTRO_FEATURES', 'sota', True, False, d): |
39 | d.appendVarFlag("do_bootimg", "depends", " %s:do_image_otaimg" % d.getVar("IMAGE_BASENAME", True)) | 43 | d.appendVarFlag("do_bootimg", "depends", " %s:do_image_ota_ext4" % d.getVar("IMAGE_BASENAME", True)) |
40 | } | 44 | } |
41 | 45 | ||
42 | # Append OSTree specific parameters to the kernel command line before creating the live image | 46 | # Append OSTree specific parameters to the kernel command line before creating the live image |