diff options
| -rw-r--r-- | meta/classes/grub-efi.bbclass | 8 | ||||
| -rw-r--r-- | meta/classes/syslinux.bbclass | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/meta/classes/grub-efi.bbclass b/meta/classes/grub-efi.bbclass index 333e6c53c7..36b583111a 100644 --- a/meta/classes/grub-efi.bbclass +++ b/meta/classes/grub-efi.bbclass @@ -16,7 +16,7 @@ do_bootimg[depends] += "grub-efi-${TARGET_ARCH}-native:do_deploy" -GRUBCFG = "grub.cfg" +GRUBCFG = "${S}/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" @@ -56,7 +56,7 @@ grubefi_iso_populate() { # 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} + sed -i "s@<EFIDIR>@${EFIDIR}@g" ${GRUB_ISODIR}/$(basename "${GRUBCFG}") } grubefi_hddimg_populate() { @@ -64,7 +64,7 @@ grubefi_hddimg_populate() { # FIXUP the <EFIDIR> token in the config # FIXME: This can be dropped once mkdosfs is fixed - sed -i "s@<EFIDIR>@@g" ${GRUB_HDDDIR}/${GRUBCFG} + sed -i "s@<EFIDIR>@@g" ${GRUB_HDDDIR}/$(basename "${GRUBCFG}") } # FIXME: The <EFIDIR> token can be replaced with ${EFIDIR} once the @@ -90,8 +90,6 @@ python build_grub_cfg() { if not cfile: raise bb.build.FuncFailed('Unable to read GRUBCFG') - #bb.mkdirhier(os.path.dirname(cfile)) - try: cfgfile = file(cfile, 'w') except OSError: diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass index 6eb804b75c..91c4275747 100644 --- a/meta/classes/syslinux.bbclass +++ b/meta/classes/syslinux.bbclass @@ -15,8 +15,8 @@ do_bootimg[depends] += "syslinux:do_populate_sysroot \ syslinux-native:do_populate_sysroot" -SYSLINUXCFG = "syslinux.cfg" -SYSLINUXMENU = "menu" +SYSLINUXCFG = "${S}/syslinux.cfg" +SYSLINUXMENU = "${S}/menu" SYSLINUX_ISODIR = "${ISODIR}/isolinux" SYSLINUX_HDDDIR = "${HDDDIR}" |