aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-08-06 08:43:55 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-11 10:53:05 +0100
commit0065258234e14b020f802d020fb1034bab5602f9 (patch)
tree6a6e64b33e0acbcde96929c73c2f0ddb1a81d2a0 /meta
parent7c872ea5971cbd7fc24bffcac7794b4b7d4b9a8e (diff)
downloadopenembedded-core-contrib-0065258234e14b020f802d020fb1034bab5602f9.tar.gz
boot-directdisk.bbclass: use local HDDDIR
Use $HDDDIR rather than ${HDDDIR} in build_boot_dd(), otherwise may errors: - Set these in local.conf: IMAGE_FSTYPES += "live" IMAGE_FSTYPES += "vmdk" AUTO_SYSLINUXMENU = "1" NOHDD = "1" $ bitbake core-image-sato DEBUG: Executing shell function build_boot_dd install: cannot create regular file `/path/to/core-image-sato-1.0/hddimg//vesamenu.c32': No such file or directory WARNING: exit code 1 from a shell command. This because it uses the ${HDDDIR} which is set in bootimg.bbclass, use local HDDDIR which is set in build_boot_dd() will fix the problem. (From OE-Core rev: 1891c39a359e983bb8fd7992b7b5a1aaac11baf7) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/boot-directdisk.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/boot-directdisk.bbclass b/meta/classes/boot-directdisk.bbclass
index 5107d7f8e4..09da032049 100644
--- a/meta/classes/boot-directdisk.bbclass
+++ b/meta/classes/boot-directdisk.bbclass
@@ -102,9 +102,9 @@ build_boot_dd() {
if [ "${IS_VMDK}" = "true" ]; then
if [ "x${AUTO_SYSLINUXMENU}" = "x1" ] ; then
- install -m 0644 ${STAGING_DIR}/${MACHINE}/usr/share/syslinux/vesamenu.c32 ${HDDDIR}${SYSLINUXDIR}/vesamenu.c32
+ install -m 0644 ${STAGING_DIR}/${MACHINE}/usr/share/syslinux/vesamenu.c32 $HDDDIR/${SYSLINUXDIR}/
if [ "x${SYSLINUX_SPLASH}" != "x" ] ; then
- install -m 0644 ${SYSLINUX_SPLASH} ${HDDDIR}${SYSLINUXDIR}/splash.lss
+ install -m 0644 ${SYSLINUX_SPLASH} $HDDDIR/${SYSLINUXDIR}/splash.lss
fi
fi
fi