diff options
| -rw-r--r-- | meta/classes/bootimg.bbclass | 13 | ||||
| -rw-r--r-- | meta/classes/dummy.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/grub-efi.bbclass | 140 |
3 files changed, 155 insertions, 0 deletions
diff --git a/meta/classes/bootimg.bbclass b/meta/classes/bootimg.bbclass index 0554ffa00a..ce95801bff 100644 --- a/meta/classes/bootimg.bbclass +++ b/meta/classes/bootimg.bbclass @@ -35,7 +35,12 @@ ISODIR = "${S}/cd" BOOTIMG_VOLUME_ID ?= "boot" BOOTIMG_EXTRA_SPACE ?= "512" +EFI = ${@base_contains("MACHINE_FEATURES", "efi", "1", "0", d)} +EFI_CLASS = ${@base_contains("MACHINE_FEATURES", "efi", "grub-efi", "dummy", d)} + inherit syslinux +inherit ${EFI_CLASS} + build_iso() { # Only create an ISO if we have an INITRD and NOISO was not set @@ -47,6 +52,9 @@ build_iso() { install -d ${ISODIR} syslinux_iso_populate + if [ "${EFI}" = "1" ]; then + grubefi_iso_populate + fi mkisofs -V ${BOOTIMG_VOLUME_ID} \ -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.iso \ @@ -63,6 +71,9 @@ build_hddimg() { if [ "${NOHDD}" != "1" ] ; then install -d ${HDDDIR} syslinux_hddimg_populate + if [ "${EFI}" = "1" ]; then + grubefi_hddimg_populate + fi # Determine the block count for the final image BLOCKS=`du -bks ${HDDDIR} | cut -f 1` @@ -83,6 +94,8 @@ build_hddimg() { python do_bootimg() { bb.build.exec_func('build_syslinux_cfg', d) + if d.getVar("EFI", True) == "1": + bb.build.exec_func('build_grub_cfg', d) bb.build.exec_func('build_hddimg', d) bb.build.exec_func('build_iso', d) } diff --git a/meta/classes/dummy.bbclass b/meta/classes/dummy.bbclass new file mode 100644 index 0000000000..8c300717d0 --- /dev/null +++ b/meta/classes/dummy.bbclass @@ -0,0 +1,2 @@ +# An empty bbclass to facilitate dynamic inherit, include, +# and require statements. 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 <EFIDIR> token in the config + # FIXME: This can be dropped once mkdosfs is fixed + sed -i "s@<EFIDIR>@${EFIDIR}@g" ${GRUB_ISODIR}/${GRUBCFG} +} + +grubefi_hddimg_populate() { + grubefi_populate ${GRUB_HDDDIR} + + # FIXUP the <EFIDIR> token in the config + # FIXME: This can be dropped once mkdosfs is fixed + sed -i "s@<EFIDIR>@@g" ${GRUB_HDDDIR}/${GRUBCFG} +} + +# FIXME: The <EFIDIR> 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 <EFIDIR>/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 <EFIDIR>/initrd') + cfgfile.write('\n}\n') + + cfgfile.close() +} |