From 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf Mon Sep 17 00:00:00 2001
From: takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp>
Date: Mon, 2 Nov 2020 11:07:33 +0900
Subject: basesystem-jj recipes

---
 external/poky/meta/classes/grub-efi-cfg.bbclass | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'external/poky/meta/classes/grub-efi-cfg.bbclass')

diff --git a/external/poky/meta/classes/grub-efi-cfg.bbclass b/external/poky/meta/classes/grub-efi-cfg.bbclass
index 5eeee6c2..3a2cdd69 100644
--- a/external/poky/meta/classes/grub-efi-cfg.bbclass
+++ b/external/poky/meta/classes/grub-efi-cfg.bbclass
@@ -23,10 +23,12 @@ GRUB_TIMEOUT ?= "10"
 #FIXME: build this from the machine config
 GRUB_OPTS ?= "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1"
 
-EFIDIR = "/EFI/BOOT"
 GRUB_ROOT ?= "${ROOT}"
 APPEND ?= ""
 
+# Uses MACHINE specific KERNEL_IMAGETYPE
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 # Need UUID utility code.
 inherit fs-uuid
 
@@ -86,6 +88,12 @@ python build_efi_cfg() {
     for label in labels.split():
         localdata = d.createCopy()
 
+        overrides = localdata.getVar('OVERRIDES')
+        if not overrides:
+            bb.fatal('OVERRIDES not defined')
+
+        localdata.setVar('OVERRIDES', 'grub_' + label + ':' + overrides)
+
         for btype in btypes:
             cfgfile.write('\nmenuentry \'%s%s\'{\n' % (label, btype[0]))
             lb = label
-- 
cgit 1.2.3-korg