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, 2 insertions, 0 deletions

diff --git a/conf/distro/eneanfvaccess.conf b/conf/distro/eneanfvaccess.conf
index c31363d..2c81393 100644
--- a/conf/distro/eneanfvaccess.conf
+++ b/conf/distro/eneanfvaccess.conf
@@ -15,6 +15,8 @@ PREFERRED_PROVIDER_virtual/java-initial-native = "cacao-initial-native"
 PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
 PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
 
+# Override ESP mount path set by meta/conf/image-uefi.conf to align with meta-secure-core paths
+EFI_PREFIX_df-efi-secure-boot = "/boot/efi"
 SBFOLDER = "bootloader"
 
 HOSTTOOLS_append = " scp"