]> code.ossystems Code Review - openembedded-core.git/commitdiff
boot-directdisk.bbclass: use local HDDDIR
authorRobert Yang <liezhi.yang@windriver.com>
Wed, 6 Aug 2014 15:43:55 +0000 (08:43 -0700)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 11 Aug 2014 09:46:58 +0000 (10:46 +0100)
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.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/classes/boot-directdisk.bbclass

index 5107d7f8e41918019ee02e465d370691b439a9f5..09da0320490b1693ba6018a6e36e2ca9a3491d27 100644 (file)
@@ -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