From: California Sullivan <california.l.sullivan@intel.com>
Date: Mon, 22 May 2017 17:35:01 +0000 (-0700)
Subject: systemd-boot.bbclass: Add configuration data to secondary EFI partition
X-Git-Tag: uninative-1.7~762
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=84aa7a00810e135fdad3f77bdb1da7d1f5fb8627;p=openembedded-core.git

systemd-boot.bbclass: Add configuration data to secondary EFI partition

The secondary EFI partition is used when booting in EFI mode, and
without the configuration data we don't get any boot targets.

Partial fix to [YOCTO #11503].

Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/classes/systemd-boot.bbclass b/meta/classes/systemd-boot.bbclass
index 4412fb1ef7..9f8f75e06c 100644
--- a/meta/classes/systemd-boot.bbclass
+++ b/meta/classes/systemd-boot.bbclass
@@ -50,6 +50,7 @@ efi_iso_populate() {
         efi_populate $iso_dir
         mkdir -p ${EFIIMGDIR}/${EFIDIR}
         cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR}
+        cp -r $iso_dir/loader ${EFIIMGDIR}
         cp $iso_dir/vmlinuz ${EFIIMGDIR}
         EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
         echo "fs0:${EFIPATH}\\${DEST_EFI_IMAGE}" > ${EFIIMGDIR}/startup.nsh