From 0ac89346dea9ae52aa9b8c11a6e6bf84ab82e3c9 Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Tue, 17 Sep 2013 13:32:17 +0000 Subject: boot-directdisk.bbclass: Fix media generation problems with vmdk The various populate methods need to accept a path as an argument vs using hard expanded variables. In the case of the boot-directdisk class it uses a different path for HDDDIR but it gets eclipsed by the the class definition at the point in time ${HDDDIR} gets expanded. The logical fix is to pass the arguments to the functions as opposed to using globally expanded variables from the class definitions. This patch changes 3 things: 1) syslinux_hddimg_populate takes an argument for the destination 2) syslinux_iso_populate takes an argument for the destination 3) populate is changed to boot_direct_populate because there was a conflict with it overriding the populate in bootimg.bbclass [YOCTO #3994] (From OE-Core rev: 63d164b755b984021f7e3cdba7280918ded6e821) Signed-off-by: Jason Wessel Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/grub-efi.bbclass | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'meta/classes/grub-efi.bbclass') diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass index 591bee25ef..96fb98b043 100644 --- a/meta/classes/grub-efi.bbclass +++ b/meta/classes/grub-efi.bbclass @@ -42,19 +42,20 @@ grubefi_populate() { } grubefi_iso_populate() { - grubefi_populate ${ISODIR} + iso_dir=$1 + grubefi_populate $iso_dir # Build a EFI directory to create efi.img mkdir -p ${EFIIMGDIR}/${EFIDIR} - cp ${ISODIR}/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR} - cp ${ISODIR}/vmlinuz ${EFIIMGDIR} + cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR} + cp $iso_dir/vmlinuz ${EFIIMGDIR} echo "EFI\\BOOT\\${GRUB_IMAGE}" > ${EFIIMGDIR}/startup.nsh - if [ -f "${ISODIR}/initrd" ] ; then - cp ${ISODIR}/initrd ${EFIIMGDIR} + if [ -f "$iso_dir/initrd" ] ; then + cp $iso_dir/initrd ${EFIIMGDIR} fi } grubefi_hddimg_populate() { - grubefi_populate ${HDDDIR} + grubefi_populate $1 } python build_grub_cfg() { -- cgit v1.2.3-54-g00ecf