grub: Fix duplicate/unused grubx64.efi, cleanup

1. EFI_PREFIX: Fix duplicate grubx64.efi binaries by aligning paths:
   * by default, upstream meta-oe and meta-secure-core both install
     grubx64.efi, but in different locations (/boot/EFI/BOOT vs
     /boot/efi/EFI/BOOT) unless we explicitely override some vars to
     align the 2 paths; use the old behavior (/boot/efi/EFI/BOOT),
     as meta-secure-core has multiple recipes that reference it, while
     meta-oe allows changing the path via a single var override;
   * note that in an OSTree deployment, these paths don't even exist
     on target, we explicity install grubx64.efi during Enea Edge
     installation by copying grubx64.efi from /EFI/BOOT in hddimg;

2. live-vm-common: use ${EFI_FILES_PATH} instead of hardcoding it;

3. core-image-minimal-initramfs, enea-nfv-access: Blacklist
   grub-common-extras package on x86-64 machines if OSTree is used;

Depends-On: I703b53fd09c5ed75731375414f3e711ec3dadc3e
Change-Id: I3735bc004ece62f94172108f2e7ed4596942deea
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/classes/override_live-vm-common.inc b/classes/override_live-vm-common.inc
index dc8e076..6fabbf0 100644
--- a/classes/override_live-vm-common.inc
+++ b/classes/override_live-vm-common.inc
@@ -15,7 +15,7 @@ efi_populate_common() {
 
         ## ENEA_start ##
         # Install EFI binaries
-        install -m 0644 ${IMAGE_ROOTFS}/boot/efi${EFIDIR}/*.* ${DEST}${EFIDIR}
+        install -m 0644 ${IMAGE_ROOTFS}${EFI_FILES_PATH}/*.* ${DEST}${EFIDIR}
 
         # Install kernel and initramfs sig
         install -m 0644 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${SB_FILE_EXT} ${DEST}/${KERNEL_IMAGETYPE}${SB_FILE_EXT}