summaryrefslogtreecommitdiff
path: root/meta/classes/grub-efi.bbclass
diff options
context:
space:
mode:
authorDarren Hart <dvhart@linux.intel.com>2011-12-01 19:20:15 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-02 15:28:33 +0000
commit2c4b1675eb3c8c599e3b7f33e459aa608c2b93f2 (patch)
tree277af5c68faa14f389a50516ce06db0d42054048 /meta/classes/grub-efi.bbclass
parentd4aef096fb4067d3572ce26a7e25e9b2fb485066 (diff)
downloadopenembedded-core-2c4b1675eb3c8c599e3b7f33e459aa608c2b93f2.tar.gz
openembedded-core-2c4b1675eb3c8c599e3b7f33e459aa608c2b93f2.tar.bz2
openembedded-core-2c4b1675eb3c8c599e3b7f33e459aa608c2b93f2.zip
bootimage: Use ${S} explicitly for generated config files
The syslinux and grub-efi classes were generating config files in the current working directory. This caused a failure due to a race in the creation of the directories leading to cwd changing and the build failing to find the config files. While this has been addressed in bitbake, it is better to use an explicit path. While ${WORKDIR} may seem a more appropriate place, the recipe already uses ${S} for the "hdd" and "cd" construction, so we use ${S} here to keep things consolidated and consistent and address the issue with minimal change. Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/grub-efi.bbclass')
-rw-r--r--meta/classes/grub-efi.bbclass8
1 files changed, 3 insertions, 5 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: