diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2021-04-26 14:03:43 +0200 |
---|---|---|
committer | Dan Andresan <Dan.Andresan@enea.com> | 2021-05-26 09:23:27 +0200 |
commit | 20e1f95b49cb2dfb321b770b260b0d82d49fe699 (patch) | |
tree | 04eab62d54f128bcacd1ffe50de3618b1b1d2c20 | |
parent | a3d29a419e80277de3c86ab24434bb66f9ee16a9 (diff) | |
download | meta-el-nfv-access-20e1f95b49cb2dfb321b770b260b0d82d49fe699.tar.gz |
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>
-rw-r--r-- | classes/override_live-vm-common.inc | 2 | ||||
-rw-r--r-- | conf/distro/eneanfvaccess.conf | 2 | ||||
-rw-r--r-- | images/core-image-minimal-initramfs.bbappend | 2 | ||||
-rw-r--r-- | images/enea-nfv-access-common.inc | 2 |
4 files changed, 7 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() { | |||
15 | 15 | ||
16 | ## ENEA_start ## | 16 | ## ENEA_start ## |
17 | # Install EFI binaries | 17 | # Install EFI binaries |
18 | install -m 0644 ${IMAGE_ROOTFS}/boot/efi${EFIDIR}/*.* ${DEST}${EFIDIR} | 18 | install -m 0644 ${IMAGE_ROOTFS}${EFI_FILES_PATH}/*.* ${DEST}${EFIDIR} |
19 | 19 | ||
20 | # Install kernel and initramfs sig | 20 | # Install kernel and initramfs sig |
21 | install -m 0644 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${SB_FILE_EXT} ${DEST}/${KERNEL_IMAGETYPE}${SB_FILE_EXT} | 21 | install -m 0644 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}${SB_FILE_EXT} ${DEST}/${KERNEL_IMAGETYPE}${SB_FILE_EXT} |
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" | |||
15 | PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" | 15 | PREFERRED_PROVIDER_virtual/java-native = "jamvm-native" |
16 | PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" | 16 | PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native" |
17 | 17 | ||
18 | # Override ESP mount path set by meta/conf/image-uefi.conf to align with meta-secure-core paths | ||
19 | EFI_PREFIX_df-efi-secure-boot = "/boot/efi" | ||
18 | SBFOLDER = "bootloader" | 20 | SBFOLDER = "bootloader" |
19 | 21 | ||
20 | HOSTTOOLS_append = " scp" | 22 | HOSTTOOLS_append = " scp" |
diff --git a/images/core-image-minimal-initramfs.bbappend b/images/core-image-minimal-initramfs.bbappend index 5512158..013463a 100644 --- a/images/core-image-minimal-initramfs.bbappend +++ b/images/core-image-minimal-initramfs.bbappend | |||
@@ -7,6 +7,8 @@ PACKAGE_INSTALL_append_sota = " ostree-switchroot" | |||
7 | # run-postinsts does not belong in the minimal initramfs | 7 | # run-postinsts does not belong in the minimal initramfs |
8 | PACKAGE_INSTALL_remove = "run-postinsts" | 8 | PACKAGE_INSTALL_remove = "run-postinsts" |
9 | 9 | ||
10 | PACKAGE_EXCLUDE_x86-64_sota += "grub-common-extras" | ||
11 | |||
10 | create_enea_symlink() { | 12 | create_enea_symlink() { |
11 | # enea image used in bare metal installation | 13 | # enea image used in bare metal installation |
12 | cd ${DEPLOY_DIR_IMAGE} | 14 | cd ${DEPLOY_DIR_IMAGE} |
diff --git a/images/enea-nfv-access-common.inc b/images/enea-nfv-access-common.inc index df93026..2a7a8c6 100644 --- a/images/enea-nfv-access-common.inc +++ b/images/enea-nfv-access-common.inc | |||
@@ -10,6 +10,8 @@ IMAGE_INSTALL += " \ | |||
10 | # run-postinsts duplicates dpkg-configure if package_deb is used | 10 | # run-postinsts duplicates dpkg-configure if package_deb is used |
11 | PACKAGE_INSTALL_remove = "${@bb.utils.contains('PACKAGE_CLASSES', 'package_deb', 'run-postinsts', '', d)}" | 11 | PACKAGE_INSTALL_remove = "${@bb.utils.contains('PACKAGE_CLASSES', 'package_deb', 'run-postinsts', '', d)}" |
12 | 12 | ||
13 | PACKAGE_EXCLUDE_x86-64_sota += "grub-common-extras" | ||
14 | |||
13 | # After installing packages inside the rootfs, remove backup DPKG status file | 15 | # After installing packages inside the rootfs, remove backup DPKG status file |
14 | rootfs_postinstall_dpkg_cleanup () { | 16 | rootfs_postinstall_dpkg_cleanup () { |
15 | if ${@bb.utils.contains('PACKAGE_CLASSES', 'package_deb', 'true', 'false', d)}; then | 17 | if ${@bb.utils.contains('PACKAGE_CLASSES', 'package_deb', 'true', 'false', d)}; then |