diff options
Diffstat (limited to 'meta/classes/grub-efi.bbclass')
| -rw-r--r-- | meta/classes/grub-efi.bbclass | 12 |
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 | ||
| 27 | EFIDIR = "/EFI/BOOT" | 27 | EFIDIR = "/EFI/BOOT" |
| 28 | 28 | ||
| 29 | grubefi_populate() { | 29 | efi_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 | ||
| 45 | grubefi_iso_populate() { | 45 | efi_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 | ||
| 58 | grubefi_hddimg_populate() { | 58 | efi_hddimg_populate() { |
| 59 | grubefi_populate $1 | 59 | efi_populate $1 |
| 60 | } | 60 | } |
| 61 | 61 | ||
| 62 | python build_grub_cfg() { | 62 | python build_efi_cfg() { |
| 63 | import sys | 63 | import sys |
| 64 | 64 | ||
| 65 | workdir = d.getVar('WORKDIR', True) | 65 | workdir = d.getVar('WORKDIR', True) |
