Merge branch 'develop'demo_CPDX-3644demo_CPDX-3634

Change-Id: I75bd22a68d9de4d96b65586be3c14fda7892b803

1 files changed, 0 insertions, 69 deletions

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
-}