Skip to contentSkip to conversation

boot-directdisk.bbclass: use local HDDDIR

PATCH New Robert Yang 1 participant 2 messages Aug 6, 2014

lore
Share & tools
lore
#0 lore raw

cover boot-directdisk.bbclass: use local HDDDIR

The following changes since commit 1fafe7ccc563d5ac9e41f5c1de93d2736745b512:

ghostscript: Remove bogus gsfonts reference from DESCRIPTION (2014-08-06 11:14:21 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/hdd
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/hdd

Robert Yang (1):
boot-directdisk.bbclass: use local HDDDIR

 meta/classes/boot-directdisk.bbclass |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/1 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.

---
 meta/classes/boot-directdisk.bbclass |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
meta/classes/boot-directdisk.bbclass +2 -2
index 5107d7f..09da032 100644
@@ -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
Signature · 1 line
1.7.9.5