4 files changed, 63 insertions, 31 deletions

diff --git a/images/core-image-minimal-initramfs.bbappend b/images/core-image-minimal-initramfs.bbappend
index 67ab251..88dd198 100644
--- a/images/core-image-minimal-initramfs.bbappend
+++ b/images/core-image-minimal-initramfs.bbappend
@@ -1,12 +1,16 @@
-PACKAGE_INSTALL += " nfv-installer kernel-modules ixgbe"
+PACKAGE_INSTALL += " nfv-installer kernel-modules"
 
-# ostree-switchroot is used by the init script to switch root to the
-# ostree version specified in the kernel command line
-PACKAGE_INSTALL_append_sota = " ostree-switchroot"
+INITRAMFS_SCRIPTS = " \
+    initramfs-framework-base \
+    initramfs-module-udev \
+    initramfs-module-setup-live \
+"
 
 # run-postinsts does not belong in the minimal initramfs
 PACKAGE_INSTALL_remove = "run-postinsts"
 
+PACKAGE_EXCLUDE_x86-64_sota += "grub-common-extras"
+
 create_enea_symlink() {
     # enea image used in bare metal installation
     cd ${DEPLOY_DIR_IMAGE}
diff --git a/images/enea-edge-common.inc b/images/enea-edge-common.inc
index 5472056..b174064 100644
--- a/images/enea-edge-common.inc
+++ b/images/enea-edge-common.inc
@@ -10,6 +10,8 @@ IMAGE_INSTALL += " \
 # run-postinsts duplicates dpkg-configure if package_deb is used
 PACKAGE_INSTALL_remove = "${@bb.utils.contains('PACKAGE_CLASSES', 'package_deb', 'run-postinsts', '', d)}"
 
+PACKAGE_EXCLUDE_x86-64_sota += "grub-common-extras"
+
 # After installing packages inside the rootfs, remove backup DPKG status file
 rootfs_postinstall_dpkg_cleanup () {
     if ${@bb.utils.contains('PACKAGE_CLASSES', 'package_deb', 'true', 'false', d)}; then
@@ -18,9 +20,21 @@ 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)}"
-SOTA_CLIENT = ""
+# Remove aktualizr packages from the image, we don't use it and creates odd dependencies, e.g.
+# it creates a systemd unit that depends on network-online.target, which leads to enabling
+# NetworkManager-wait-online.service, delaying boot up.
 SOTA_CLIENT_PROV = ""
+IMAGE_INSTALL_remove_sota = " \
+    aktualizr \
+    aktualizr-info \
+    "
+
+# We currently don't use automatic push/sign/check to a backend server, so skip running useless
+# OSTree tasks during image build.
+IMAGE_FSTYPES_remove_sota = " \
+    ostreepush \
+    garagesign \
+    garagecheck \
+    "
diff --git a/images/enea-edge-host-common.inc b/images/enea-edge-host-common.inc
index 6d446a0..3df6cb9 100644
--- a/images/enea-edge-host-common.inc
+++ b/images/enea-edge-host-common.inc
@@ -1,11 +1,11 @@
+IMAGE_FSTYPES += "hddimg"
+IMAGE_FSTYPES_remove = "wic"
+
 REQUIRE_FILES = " \
     images/enea-edge-common.inc \
-    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 \
+    classes/override_live-vm-common.inc \
     images/secure-boot.inc \
     "
 
@@ -19,28 +19,26 @@ IMAGE_INSTALL += " \
 # Set labels for GRUB and SYSLINUX
 LABELS_LIVE = "installer live-boot"
 
-GRUB_GFXSERIAL_x86-64 = "1"
 # Append default parameters for x86-64 targets
-APPEND_x86-64 = "quiet"
+APPEND_x86-64 = "quiet console=tty0 console=ttyS0,115200"
 SYSLINUX_DEFAULT_CONSOLE_x86-64 = "console=ttyS0,115200"
 
 # Skip menu and boot installer immediately
 GRUB_TIMEOUT_x86-64 = "0"
 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"
-
 # If building with sota enabled, build the otaimg before the hddimg, because
 # the hddimg needs it as a base image
 python __anonymous() {
+    ## ENEA_start ##
     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))
+    ## ENEA_end ##
 }
 
 # Append OSTree specific parameters to the kernel command line before creating the live image
 python do_bootimg_prepend () {
+    ## ENEA_start ##
     if bb.utils.contains('DISTRO_FEATURES', 'sota', True, False, d):
         ostree_osname = d.getVar('OSTREE_OSNAME')
         checksum = bb.utils.sha256_file(d.getVar('DEPLOY_DIR_IMAGE') + "/" + d.getVar('OSTREE_KERNEL'))
@@ -49,21 +47,38 @@ python do_bootimg_prepend () {
         ostree_params = " ostree=/ostree/boot.1/" + ostree_osname + "/" + checksum + "/0"
 
         d.setVar("APPEND", d.getVar("APPEND") + ostree_params)
-}
-
-# Get rid of GRUB dependencies added by ostree. See:
-# https://git.enea.com/cgit/linux/meta-updater.git/tree/classes/image_types_ota.bbclass#n45
-python __anonymous () {
-    d.delVarFlag("do_image_otaimg", "depends")
-    d.setVarFlag("do_image_otaimg", "depends", "e2fsprogs-native:do_populate_sysroot")
+    ## ENEA_end ##
 }
 
 # Before building the OSTree image, move DPKG data to /usr/dpkg, because
 # OSTree does not preserve the contents of /var
 IMAGE_CMD_ostree_prepend () {
-
-    install -d ${IMAGE_ROOTFS}/usr/dpkg/lib/dpkg
-    if [ "$(ls -A ${IMAGE_ROOTFS}/var/lib/dpkg)" ]; then
-        mv ${IMAGE_ROOTFS}/var/lib/dpkg/* ${IMAGE_ROOTFS}/usr/dpkg/lib/dpkg/
+    ## ENEA_start ##
+    # Note: We do configure DPKG admindir at build time, but we can't do the same for APT since
+    # yocto hardcodes /var/lib/dpkg paths in various places in OE-core, which we can't override,
+    # so instead we move the contents to their expected location here and configure apt at runtime
+    # via a configuration fragment to use the new location.
+    mkdir -p usr/dpkg/lib/dpkg
+    if [ "$(ls -A var/lib/dpkg)" ]; then
+        mv var/lib/dpkg/* usr/dpkg/lib/dpkg/
     fi
+    # In Enea Edge, the EFI binaries (shim, seloader etc.) are copied from the yocto deploy dir to
+    # the installation image (hddimg) - see "classes/override_live-vm-common.inc" in this repo;
+    # and during Enea Edge installation (via utils.sh) from hddimg to the destination disk.
+    # Files installed by the package manager end up under OSTree /boot hardlink tree, but are
+    # never actually used. To avoid confusion and save some resources, clean them up.
+    rm -rf boot/*
+    ## ENEA_end ##
+}
+
+IMAGE_CMD_ota_prepend () {
+        ## ENEA_start ##
+        if [ "${OSTREE_BOOTLOADER}" = "grub" ]; then
+                # Upstream bbclass creates /boot/grub2, complement it with /boot/grub
+                # Note: /boot/grub2 is a dir with /boot/grub2/grub.cfg -> ../loader/grub.cfg symlink
+                # while /boot/grub -> loader is a symlink to also account for /boot/grub/grubenv
+                mkdir -p ${OTA_SYSROOT}/boot
+                ln -s loader ${OTA_SYSROOT}/boot/grub
+        fi
+        ## ENEA_end ##
 }
diff --git a/images/enea-edge-vnf.bb b/images/enea-edge-vnf.bb
index 9351160..5d2365b 100644
--- a/images/enea-edge-vnf.bb
+++ b/images/enea-edge-vnf.bb
@@ -6,7 +6,6 @@ IMAGE_FSTYPES += "wic.qcow2"
 WKS_FILE = "enea-edge-vnf-qemux86-64.wks"
 
 CLOUDINITPKGS = "cloud-init util-linux-blkid"
-CLOUDINITPKGS += " ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'cloud-init-systemd', '', d)}"
 
 IMAGE_INSTALL += " \
     packagegroup-enea-virtualization-guest \