From 5f980c14dafb466e1d71e0b6e7487aa522ade9f9 Mon Sep 17 00:00:00 2001 From: Adrian Dudau Date: Wed, 24 Mar 2021 11:58:07 +0100 Subject: Upgrade to gatesgarth This is an initial commit, containing quick fixes and hacks to allow building the images. All these issues will be re-evaluated and fixed properly in their own commits. Signed-off-by: Adrian Dudau --- images/enea-nfv-access-common.inc | 4 ++-- images/enea-nfv-access-host-common.inc | 12 ++++++++---- images/enea-nfv-access.bb | 1 - 3 files changed, 10 insertions(+), 7 deletions(-) (limited to 'images') diff --git a/images/enea-nfv-access-common.inc b/images/enea-nfv-access-common.inc index 5472056..a10e2e2 100644 --- a/images/enea-nfv-access-common.inc +++ b/images/enea-nfv-access-common.inc @@ -18,9 +18,9 @@ rootfs_postinstall_dpkg_cleanup () { } ROOTFS_POSTINSTALL_COMMAND_append += " rootfs_postinstall_dpkg_cleanup;" -IMAGE_FSTYPES = "ext4 ext4.gz tar.gz" +IMAGE_FSTYPES += "ext4 ext4.gz tar.gz" # Add ostree specific image types if sota support is set -IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'otaimg wic', ' ', d)}" +IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'ota-ext4 wic', ' ', d)}" SOTA_CLIENT = "" SOTA_CLIENT_PROV = "" 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 diff --git a/images/enea-nfv-access.bb b/images/enea-nfv-access.bb index 9311992..08239ae 100644 --- a/images/enea-nfv-access.bb +++ b/images/enea-nfv-access.bb @@ -3,5 +3,4 @@ DESCRIPTION = "Image for the host side of the Enea NFV Access Platform with ODM require images/enea-nfv-access-host-common.inc IMAGE_INSTALL += " \ - element-vcpe \ " -- cgit v1.2.3-54-g00ecf