13 files changed, 176 insertions, 121 deletions

diff --git a/images/core-image-minimal-initramfs.bbappend b/images/core-image-minimal-initramfs.bbappend
index 2ca1d47..88dd198 100644
--- a/images/core-image-minimal-initramfs.bbappend
+++ b/images/core-image-minimal-initramfs.bbappend
@@ -1,5 +1,21 @@
 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}
+    ln -sf ${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.cpio.gz enea-image-minimal-initramfs-${MACHINE}.cpio.gz
+    cd -
+}
+
+IMAGE_POSTPROCESS_COMMAND_append += " create_enea_symlink;"
diff --git a/images/enea-edge-common.inc b/images/enea-edge-common.inc
new file mode 100644
index 0000000..b174064
--- /dev/null
+++ b/images/enea-edge-common.inc
@@ -0,0 +1,40 @@
+require images/enea-image-common.inc
+
+IMAGE_FEATURES += "ssh-server-openssh"
+
+IMAGE_INSTALL += " \
+    packagegroup-enea-virtualization \
+    kernel-modules \
+    "
+
+# 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
+        rm -f ${IMAGE_ROOTFS}/var/lib/dpkg/status-old
+    fi
+}
+ROOTFS_POSTINSTALL_COMMAND_append += " rootfs_postinstall_dpkg_cleanup;"
+
+IMAGE_FSTYPES += "ext4 ext4.gz tar.gz"
+
+# 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
new file mode 100644
index 0000000..3df6cb9
--- /dev/null
+++ b/images/enea-edge-host-common.inc
@@ -0,0 +1,84 @@
+IMAGE_FSTYPES += "hddimg"
+IMAGE_FSTYPES_remove = "wic"
+
+REQUIRE_FILES = " \
+    images/enea-edge-common.inc \
+    "
+REQUIRE_FILES_append_df-efi-secure-boot = " \
+    classes/override_live-vm-common.inc \
+    images/secure-boot.inc \
+    "
+
+require ${REQUIRE_FILES}
+
+IMAGE_INSTALL += " \
+    packagegroup-enea-virtualization-host \
+    packagegroup-enea-virtualization-4gusb-modems \
+    "
+
+# Set labels for GRUB and SYSLINUX
+LABELS_LIVE = "installer live-boot"
+
+# Append default parameters for x86-64 targets
+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"
+
+# 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_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'))
+
+        # The boot tree is identified through a sha256 checksum over the kernel binary
+        ostree_params = " ostree=/ostree/boot.1/" + ostree_osname + "/" + checksum + "/0"
+
+        d.setVar("APPEND", d.getVar("APPEND") + ostree_params)
+    ## 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 () {
+    ## 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-runtime-debug.bb b/images/enea-edge-runtime-debug.bb
new file mode 100644
index 0000000..4736f24
--- /dev/null
+++ b/images/enea-edge-runtime-debug.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Image for the host side of the Enea Edge Runtime with ODM and NETCONF Edgelink customizations"
+
+require images/enea-edge-host-common.inc
+
+IMAGE_INSTALL += " \
+    element-vcpe \
+    gdbserver \
+    oprofile \
+    "
diff --git a/images/enea-nfv-access-esdk.bb b/images/enea-edge-runtime-esdk.bb
index d424ef6..d424ef6 100644
--- a/images/enea-nfv-access-esdk.bb
+++ b/images/enea-edge-runtime-esdk.bb
diff --git a/images/enea-nfv-access-sdk.bb b/images/enea-edge-runtime-sdk.bb
index a957add..c6a15b4 100644
--- a/images/enea-nfv-access-sdk.bb
+++ b/images/enea-edge-runtime-sdk.bb
@@ -1,6 +1,6 @@
-DESCRIPTION = "Image for building the SDK for the host side of the Enea NFV Access Platform with ODM customizations"
+DESCRIPTION = "Image for building the SDK for the host side of the Enea Edge Runtime with ODM customizations"
 
-require images/enea-nfv-access-host-common.inc
+require images/enea-edge-host-common.inc
 
 IMAGE_INSTALL += " \
     element-odm-sdk \
diff --git a/images/enea-edge-runtime.bb b/images/enea-edge-runtime.bb
new file mode 100644
index 0000000..5071619
--- /dev/null
+++ b/images/enea-edge-runtime.bb
@@ -0,0 +1,7 @@
+DESCRIPTION = "Image for the host side of the Enea Edge Runtime with ODM and NETCONF Edgelink customizations"
+
+require images/enea-edge-host-common.inc
+
+IMAGE_INSTALL += " \
+    element-vcpe \
+    "
diff --git a/images/enea-edge-vnf.bb b/images/enea-edge-vnf.bb
new file mode 100644
index 0000000..5d2365b
--- /dev/null
+++ b/images/enea-edge-vnf.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "VNF image of the Enea Edge Runtime, includes kernel, rootfs and boot parameters"
+
+require images/enea-edge-common.inc
+
+IMAGE_FSTYPES += "wic.qcow2"
+WKS_FILE = "enea-edge-vnf-qemux86-64.wks"
+
+CLOUDINITPKGS = "cloud-init util-linux-blkid"
+
+IMAGE_INSTALL += " \
+    packagegroup-enea-virtualization-guest \
+    nfv-init \
+    iperf3 \
+    ${CLOUDINITPKGS} \
+    "
diff --git a/images/enea-nfv-access-common.inc b/images/enea-nfv-access-common.inc
deleted file mode 100644
index 3f9fc84..0000000
--- a/images/enea-nfv-access-common.inc
+++ /dev/null
@@ -1,15 +0,0 @@
-require images/enea-image-common.inc
-
-IMAGE_FEATURES += "ssh-server-openssh"
-
-IMAGE_INSTALL += " \
-    packagegroup-enea-virtualization \
-    kernel-modules \
-    "
-
-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 = ""
-SOTA_CLIENT_PROV = ""
diff --git a/images/enea-nfv-access-debug.bb b/images/enea-nfv-access-debug.bb
deleted file mode 100644
index 63a2322..0000000
--- a/images/enea-nfv-access-debug.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-DESCRIPTION = "Image for the host side of the Enea NFV Access Platform with ODM and NETCONF Edgelink customizations"
-
-require images/enea-nfv-access-host-common.inc
-
-IMAGE_INSTALL += " \
-    element-vcpe \
-    gdbserver \
-    oprofile \
-    "
diff --git a/images/enea-nfv-access-host-common.inc b/images/enea-nfv-access-host-common.inc
deleted file mode 100644
index 1cde827..0000000
--- a/images/enea-nfv-access-host-common.inc
+++ /dev/null
@@ -1,69 +0,0 @@
-REQUIRE_FILES = " \
-    images/enea-nfv-access-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 \
-    images/secure-boot.inc \
-    "
-
-require ${REQUIRE_FILES}
-
-IMAGE_INSTALL += " \
-    packagegroup-enea-virtualization-host \
-    packagegroup-enea-virtualization-4gusb-modems \
-    "
-
-# 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"
-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() {
-    if bb.utils.contains('DISTRO_FEATURES', 'sota', True, False, d):
-        d.appendVarFlag("do_bootimg", "depends", " %s:do_image_otaimg" % d.getVar("IMAGE_BASENAME", True))
-}
-
-# Append OSTree specific parameters to the kernel command line before creating the live image
-python do_bootimg_prepend () {
-    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'))
-
-        # The boot tree is identified through a sha256 checksum over the kernel binary
-        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")
-}
-
-# 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/
-    fi
-}
diff --git a/images/enea-nfv-access-vnf.bb b/images/enea-nfv-access-vnf.bb
deleted file mode 100644
index a3902c2..0000000
--- a/images/enea-nfv-access-vnf.bb
+++ /dev/null
@@ -1,16 +0,0 @@
-DESCRIPTION = "VNF image of the Enea NFV Access Platform, includes kernel, rootfs and boot parameters"
-
-require images/enea-nfv-access-common.inc
-
-IMAGE_FSTYPES += "wic.qcow2"
-WKS_FILE = "enea-nfv-access-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 \
-    nfv-init \
-    iperf3 \
-    ${CLOUDINITPKGS} \
-    "
diff --git a/images/enea-nfv-access.bb b/images/enea-nfv-access.bb
deleted file mode 100644
index 9311992..0000000
--- a/images/enea-nfv-access.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-DESCRIPTION = "Image for the host side of the Enea NFV Access Platform with ODM and NETCONF Edgelink customizations"
-
-require images/enea-nfv-access-host-common.inc
-
-IMAGE_INSTALL += " \
-    element-vcpe \
-    "