From eb4aa3483b1129a7137983ed54596030a5ccba2b Mon Sep 17 00:00:00 2001 From: Darren Hart Date: Wed, 23 Nov 2011 17:56:12 -0800 Subject: bootimg: Add grub-efi support Create a new grub-efi.bbclass and integrate it into bootimg alongside the syslinux support. This new class uses the output from the grub-efi-native recipe. Thanks goes to Josef Ahmad for the original build_grub_cfg() routine. The EFI features are only added to the image if MACHINE_FEATURES contains "efi". The resulting images are therefor either legacy boot only (like they were originally) or legacy boot and EFI boot. A new "dummy.bbclass" was added to allow for the conditional include of grub-efi. This makes it so if efi support is not to be built in, we don't spend time building grub-efi-native just because the include adds the dependency. There is a bug in the mkdosfs tool from the dosfstools package which causes it to crash when the directory passed with the -d parameter contains sub-directories. An /EFI/BOOT directory is required for a proper EFI installation. Until it is fixed, we install to the top level directory for the hddimg. (From OE-Core rev: be95f54495bf9e03062f86b929c66cab6e385a03) Signed-off-by: Darren Hart Signed-off-by: Josef Ahmad Signed-off-by: Richard Purdie --- meta/classes/grub-efi.bbclass | 140 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 140 insertions(+) create mode 100644 meta/classes/grub-efi.bbclass (limited to 'meta/classes/grub-efi.bbclass') diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass new file mode 100644 index 0000000000..333e6c53c7 --- /dev/null +++ b/meta/classes/grub-efi.bbclass @@ -0,0 +1,140 @@ +# grub-efi.bbclass +# Copyright (c) 2011, Intel Corporation. +# All rights reserved. +# +# Released under the MIT license (see packages/COPYING) + +# Provide grub-efi specific functions for building bootable images. + +# External variables +# ${INITRD} - indicates a filesystem image to use as an initrd (optional) +# ${ROOTFS} - indicates a filesystem image to include as the root filesystem (optional) +# ${LABELS} - a list of targets for the automatic config +# ${APPEND} - an override list of append strings for each label +# ${GRUB_OPTS} - additional options to add to the config, ';' delimited # (optional) +# ${GRUB_TIMEOUT} - timeout before executing the deault label (optional) + +do_bootimg[depends] += "grub-efi-${TARGET_ARCH}-native:do_deploy" + +GRUBCFG = "grub.cfg" +GRUB_TIMEOUT ?= "10" +#FIXME: build this from the machine config +GRUB_OPTS ?= "serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1" + +# FIXME: add EFI/BOOT to GRUB_HDDDIR once the mkdosfs subdir bug is resolved +# http://bugzilla.yoctoproject.org/show_bug.cgi?id=1783 +EFIDIR = "/EFI/BOOT" +GRUB_HDDDIR = "${HDDDIR}" +GRUB_ISODIR = "${ISODIR}${EFIDIR}" + +grubefi_populate() { + DEST=$1 + + install -d ${DEST} + + install -m 0644 ${STAGING_DIR_HOST}/kernel/bzImage ${DEST}/vmlinuz + + if [ -n "${INITRD}" ] && [ -s "${INITRD}" ]; then + install -m 0644 ${INITRD} ${DEST}/initrd + fi + + if [ -n "${ROOTFS}" ] && [ -s "${ROOTFS}" ]; then + install -m 0644 ${ROOTFS} ${DEST}/rootfs.img + fi + + GRUB_IMAGE="bootia32.efi" + if [ "${TARGET_ARCH}" = "x86_64" ]; then + GRUB_IMAGE="bootx64.efi" + fi + install -m 0644 ${DEPLOY_DIR_IMAGE}/${GRUB_IMAGE} ${DEST} + + install -m 0644 ${GRUBCFG} ${DEST} +} + +grubefi_iso_populate() { + grubefi_populate ${GRUB_ISODIR} + + # FIXUP the token in the config + # FIXME: This can be dropped once mkdosfs is fixed + sed -i "s@@${EFIDIR}@g" ${GRUB_ISODIR}/${GRUBCFG} +} + +grubefi_hddimg_populate() { + grubefi_populate ${GRUB_HDDDIR} + + # FIXUP the token in the config + # FIXME: This can be dropped once mkdosfs is fixed + sed -i "s@@@g" ${GRUB_HDDDIR}/${GRUBCFG} +} + +# FIXME: The token can be replaced with ${EFIDIR} once the +# mkdosfs bug is resolved. +python build_grub_cfg() { + import sys + + workdir = d.getVar('WORKDIR', True) + if not workdir: + bb.error("WORKDIR not defined, unable to package") + return + + labels = d.getVar('LABELS', True) + if not labels: + bb.debug(1, "LABELS not defined, nothing to do") + return + + if labels == []: + bb.debug(1, "No labels, nothing to do") + return + + cfile = d.getVar('GRUBCFG', True) + if not cfile: + raise bb.build.FuncFailed('Unable to read GRUBCFG') + + #bb.mkdirhier(os.path.dirname(cfile)) + + try: + cfgfile = file(cfile, 'w') + except OSError: + raise bb.build.funcFailed('Unable to open %s' % (cfile)) + + cfgfile.write('# Automatically created by OE\n') + + opts = d.getVar('GRUB_OPTS', True) + if opts: + for opt in opts.split(';'): + cfgfile.write('%s\n' % opt) + + cfgfile.write('default=%s\n' % (labels.split()[0])) + + timeout = d.getVar('GRUB_TIMEOUT', True) + if timeout: + cfgfile.write('timeout=%s\n' % timeout) + else: + cfgfile.write('timeout=50\n') + + for label in labels.split(): + localdata = d.createCopy() + + overrides = localdata.getVar('OVERRIDES', True) + if not overrides: + raise bb.build.FuncFailed('OVERRIDES not defined') + + localdata.setVar('OVERRIDES', label + ':' + overrides) + bb.data.update_data(localdata) + + cfgfile.write('\nmenuentry \'%s\'{\n' % (label)) + cfgfile.write('linux /vmlinuz LABEL=%s' % (label)) + + append = localdata.getVar('APPEND', True) + initrd = localdata.getVar('INITRD', True) + + if append: + cfgfile.write('%s' % (append)) + cfgfile.write('\n') + + if initrd: + cfgfile.write('initrd /initrd') + cfgfile.write('\n}\n') + + cfgfile.close() +} -- cgit v1.2.3-54-g00ecf