summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2017-12-13 09:51:42 +0800
committerRobert Yang <liezhi.yang@windriver.com>2017-12-13 10:44:32 +0800
commite911950fbee39af9c5889c41872f2f77f94cc9c1 (patch)
tree37ad9209b89734a7a5b37a00f95d15b4b4b4bce3
parentba274d3c3832b5add3e599a5f350aafeb81c3cfb (diff)
downloadopenembedded-core-contrib-rbt/ml_iso.tar.gz
openembedded-core-contrib-rbt/ml_iso.tar.bz2
openembedded-core-contrib-rbt/ml_iso.zip
image-live.bbclass: remove MLPREFIX from syslinuxrbt/ml_iso
Fixed: MACHINE = "qemux86-64" require conf/multilib.conf MULTILIBS = "multilib:lib32" DEFAULTTUNE_virtclass-multilib-lib32 = "x86" IMAGE_FSTYPES += "iso" $ bitbake lib32-core-image-minimal ERROR: lib32-core-image-minimal-1.0-r0 do_bootimg: The file /usr/include/printf.h is installed by both glibc and lib32-glibc, aborting This was because: lib32-syslinux -> lib32-glibc virtual/kernel -> glibc We can build 64bit syslinux (only build, not install) to fix the problem, the do_bootimg only needs several data files of syslinux such as vesamenu.c32, these files are not arch related. Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-rw-r--r--meta/classes/image-live.bbclass2
-rw-r--r--meta/classes/syslinux.bbclass2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index 9f8ff792df..8872195f79 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -31,7 +31,7 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \
mtools-native:do_populate_sysroot \
cdrtools-native:do_populate_sysroot \
virtual/kernel:do_deploy \
- ${MLPREFIX}syslinux:do_populate_sysroot \
+ syslinux:do_populate_sysroot \
syslinux-native:do_populate_sysroot \
${@oe.utils.ifelse(d.getVar('COMPRESSISO', False),'zisofs-tools-native:do_populate_sysroot','')} \
${PN}:do_image_${@d.getVar('LIVE_ROOTFS_TYPE').replace('-', '_')} \
diff --git a/meta/classes/syslinux.bbclass b/meta/classes/syslinux.bbclass
index d6f882420e..98939badfd 100644
--- a/meta/classes/syslinux.bbclass
+++ b/meta/classes/syslinux.bbclass
@@ -17,7 +17,7 @@
# ${SYSLINUX_SERIAL_TTY} - Set alternate console=tty... kernel boot argument
# ${SYSLINUX_KERNEL_ARGS} - Add additional kernel arguments
-do_bootimg[depends] += "${MLPREFIX}syslinux:do_populate_sysroot \
+do_bootimg[depends] += "syslinux:do_populate_sysroot \
syslinux-native:do_populate_sysroot"
ISOLINUXDIR ?= "/isolinux"