From a09771b493ca8d017965abcc0d03ef12a9443a9c Mon Sep 17 00:00:00 2001
From: Adrian Dudau <adrian.dudau@enea.com>
Date: Tue, 7 May 2019 21:39:22 +0200
Subject: Override efi-populate function from grub-efi class

This override is needed to install kernel and initramfs signature
files onto the hddimg.

Change-Id: Id1434b930312cc601ca2c1782c8b5b5699ce3fd6
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
---
 classes/override_grub-efi.inc | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/classes/override_grub-efi.inc b/classes/override_grub-efi.inc
index 4c2ae64..fb1958d 100644
--- a/classes/override_grub-efi.inc
+++ b/classes/override_grub-efi.inc
@@ -87,3 +87,31 @@ python build_efi_cfg() {
 
     cfgfile.close()
 }
+
+efi_populate() {
+	# DEST must be the root of the image so that EFIDIR is not
+	# nested under a top level directory.
+	DEST=$1
+
+	install -d ${DEST}${EFIDIR}
+
+	GRUB_IMAGE="grub-efi-bootia32.efi"
+	DEST_IMAGE="bootia32.efi"
+	if [ "${TARGET_ARCH}" = "x86_64" ]; then
+		GRUB_IMAGE="grub-efi-bootx64.efi"
+		DEST_IMAGE="bootx64.efi"
+	fi
+
+        #Install EFI binaries
+        install -m 0644 ${IMAGE_ROOTFS}/boot/efi${EFIDIR}/*.* ${DEST}${EFIDIR}
+
+        #Install kernel and initramfs sig
+        install -m 0644 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}.p7b ${DEST}/vmlinuz.p7b
+        install -m 0644 ${INITRD_LIVE}.p7b ${DEST}/initrd.p7b
+
+	EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g')
+	printf 'fs0:%s\%s\n' "$EFIPATH" "$DEST_IMAGE" >${DEST}/startup.nsh
+
+	install -m 0644 ${GRUB_CFG} ${DEST}${EFIDIR}/grub.cfg
+
+}
-- 
cgit v1.2.3-54-g00ecf