From: Nicolas Guyomard <nicolas.guyomard@open.eurogiciel.org>
Date: Thu, 18 Jun 2015 07:43:04 +0000 (+0200)
Subject: grub-efi: Allow to use file name different from grub.cfg in GRUBCFG
X-Git-Tag: 2015-10~1341
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=3630f7963a472fa11a1d52bd9782fde9a9880971;p=openembedded-core.git

grub-efi: Allow to use file name different from grub.cfg in GRUBCFG

To generate a same image both in live image type and boot-directdisk image type
and make boot-direct image boot directly on the rootfs partition without using
an initramfs we need to have the ability to generate several grub.cfg files.

Signed-off-by: Nicolas Guyomard <nicolas.guyomard@open.eurogiciel.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
---

diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass
index 47bd35e049..6d58d48704 100644
--- a/meta/classes/grub-efi.bbclass
+++ b/meta/classes/grub-efi.bbclass
@@ -39,7 +39,7 @@ efi_populate() {
 	fi
 	install -m 0644 ${DEPLOY_DIR_IMAGE}/${GRUB_IMAGE} ${DEST}${EFIDIR}
 
-	install -m 0644 ${GRUBCFG} ${DEST}${EFIDIR}
+	install -m 0644 ${GRUBCFG} ${DEST}${EFIDIR}/grub.cfg
 }
 
 efi_iso_populate() {