summaryrefslogtreecommitdiffstats
path: root/meta/classes/grub-efi.bbclass
diff options
context:
space:
mode:
authorStefan Stanacar <stefanx.stanacar@intel.com>2014-03-06 19:57:25 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-11 09:30:14 -0700
commit9d04183cf8aed9eaa2aa03058488b1198f73cea0 (patch)
tree83baa1ccab871cb465fecdc88aaa112fe75cb68b /meta/classes/grub-efi.bbclass
parentde18567e623ffa1033dc1ba236cad2fa34143e56 (diff)
downloadpoky-9d04183cf8aed9eaa2aa03058488b1198f73cea0.tar.gz
bootimg/grub-efi.bbclass: allow using a different class for EFI images
Abstract away some names so one can select using EFI_PROVIDER a different class than grub-efi for populating live images, basically allowing the use of a different bootloader than grub-efi. (From OE-Core rev: 14e5de3b8f4d5902d0ac683ff45fb878e88b40ef) Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/grub-efi.bbclass')
-rw-r--r--meta/classes/grub-efi.bbclass12
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass
index 71bd00fe99..5c80c177de 100644
--- a/meta/classes/grub-efi.bbclass
+++ b/meta/classes/grub-efi.bbclass
@@ -26,7 +26,7 @@ GRUB_OPTS ?= "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1"
26 26
27EFIDIR = "/EFI/BOOT" 27EFIDIR = "/EFI/BOOT"
28 28
29grubefi_populate() { 29efi_populate() {
30 # DEST must be the root of the image so that EFIDIR is not 30 # DEST must be the root of the image so that EFIDIR is not
31 # nested under a top level directory. 31 # nested under a top level directory.
32 DEST=$1 32 DEST=$1
@@ -42,9 +42,9 @@ grubefi_populate() {
42 install -m 0644 ${GRUBCFG} ${DEST}${EFIDIR} 42 install -m 0644 ${GRUBCFG} ${DEST}${EFIDIR}
43} 43}
44 44
45grubefi_iso_populate() { 45efi_iso_populate() {
46 iso_dir=$1 46 iso_dir=$1
47 grubefi_populate $iso_dir 47 efi_populate $iso_dir
48 # Build a EFI directory to create efi.img 48 # Build a EFI directory to create efi.img
49 mkdir -p ${EFIIMGDIR}/${EFIDIR} 49 mkdir -p ${EFIIMGDIR}/${EFIDIR}
50 cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR} 50 cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR}
@@ -55,11 +55,11 @@ grubefi_iso_populate() {
55 fi 55 fi
56} 56}
57 57
58grubefi_hddimg_populate() { 58efi_hddimg_populate() {
59 grubefi_populate $1 59 efi_populate $1
60} 60}
61 61
62python build_grub_cfg() { 62python build_efi_cfg() {
63 import sys 63 import sys
64 64
65 workdir = d.getVar('WORKDIR', True) 65 workdir = d.getVar('WORKDIR', True)