[PATCH 0/1] syslinux.bbclass: pull files from correct places for multilib

[PATCH 0/1] syslinux.bbclass: pull files from correct places for multilib

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

fix the failure when building lib32 hdd/iso image:
| install: cannot stat `/buildarea/jhuang0/yp/y_x64_0705/tmp/sysroots/lib32-qemux86-64/usr/share/syslinux/ldlinux.sys': No such file or directory

tested info:
MULTILIBS = "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
IMAGE_FSTYPES += "live"

$ bitbake lib32-core-image-minimal
$ bitbake core-image-minimal

--
The following changes since commit 2ac7783e04f5e8e6005f967e1a6dd65d2fc6a19a:

  lib/oeqa/runtime: smart: add checks for smart output (2013-08-26 16:28:55 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib jhuang0/d_bootimg_0828_0
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/d_bootimg_0828_0

Jackie Huang (1):
  syslinux.bbclass: pull files from correct places for multilib

 meta/classes/syslinux.bbclass |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

-- 
1.7.4.1

[PATCH 1/1] syslinux.bbclass: pull files from correct places for multilib

[jackie.huang]

From: Jackie Huang <jackie.huang@windriver.com>

syslinux files isolinux.bin, ldlinux.sys and vesamenu.c32 are used
when building hdd/iso image, but in multilib case, STAGING_DATADIR
points to ${MLPREFIX}${MACHINE} in sysroot which is not correct
for pulling syslinux files, fix it to ${MACHINE}.

Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
---
 meta/classes/syslinux.bbclass |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index 501bc6d..a9eba59 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -40,9 +40,9 @@ syslinux_populate() {
 
 syslinux_iso_populate() {
 	syslinux_populate ${ISODIR} ${ISOLINUXDIR} isolinux.cfg
-	install -m 0644 ${STAGING_DATADIR}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR}
+	install -m 0644 ${STAGING_DIR}/${MACHINE}/${datadir}/syslinux/isolinux.bin ${ISODIR}${ISOLINUXDIR}
 	if [ "${AUTO_SYSLINUXMENU}" = 1 ] ; then
-		install -m 0644 ${STAGING_DATADIR}/syslinux/vesamenu.c32 ${ISODIR}${ISOLINUXDIR}/vesamenu.c32
+		install -m 0644 ${STAGING_DIR}/${MACHINE}/${datadir}/syslinux/vesamenu.c32 ${ISODIR}${ISOLINUXDIR}/vesamenu.c32
 		if [ "${SYSLINUX_SPLASH}" != "" ] ; then
 			install -m 0644 ${SYSLINUX_SPLASH} ${ISODIR}${ISOLINUXDIR}/splash.lss
 		fi
@@ -51,9 +51,9 @@ syslinux_iso_populate() {
 
 syslinux_hddimg_populate() {
 	syslinux_populate ${HDDDIR} ${SYSLINUXDIR} syslinux.cfg
-	install -m 0444 ${STAGING_DATADIR}/syslinux/ldlinux.sys ${HDDDIR}${SYSLINUXDIR}/ldlinux.sys
+	install -m 0444 ${STAGING_DIR}/${MACHINE}/${datadir}/syslinux/ldlinux.sys ${HDDDIR}${SYSLINUXDIR}/ldlinux.sys
 	if [ "${AUTO_SYSLINUXMENU}" = 1 ] ; then
-		install -m 0644 ${STAGING_DATADIR}/syslinux/vesamenu.c32 ${HDDDIR}${SYSLINUXDIR}/vesamenu.c32
+		install -m 0644 ${STAGING_DIR}/${MACHINE}/${datadir}/syslinux/vesamenu.c32 ${HDDDIR}${SYSLINUXDIR}/vesamenu.c32
 		if [ "${SYSLINUX_SPLASH}" != "" ] ; then
 			install -m 0644 ${SYSLINUX_SPLASH} ${HDDDIR}${SYSLINUXDIR}/splash.lss
 		fi
-- 
1.7.4.1