From ba4f7d090d573cc40dee91eea6c0c9f9ca596b50 Mon Sep 17 00:00:00 2001 From: Nathan Rossi Date: Wed, 18 May 2016 20:52:58 +1000 Subject: machine-xilinx-default.inc: Disable 'qemu-usermode' for MicroBlaze The qemu-usermode machine feature enables the ability for using QEMU linux-user during the host build. This allows for the distro feature gobject-introspection-data to use linux-user mode of QEMU to generate data. But this process is broken on MicroBlaze due to issues with glib and the MicroBlaze toolchain. This change disables the use of QEMU linux-user and is a workaround to avoid the execution of the gobject-introspection-data process which is default enabled in commonly used distros ('nodistro' and 'poky'). Signed-off-by: Nathan Rossi --- conf/machine/include/machine-xilinx-default.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc index 1b41aa19..e52e4c33 100644 --- a/conf/machine/include/machine-xilinx-default.inc +++ b/conf/machine/include/machine-xilinx-default.inc @@ -2,6 +2,9 @@ MACHINE_FEATURES_BACKFILL_CONSIDERED += "rtc" +# MicroBlaze cannot handle the execution of qemu-linux-user for gobject-introspection-data +MACHINE_FEATURES_BACKFILL_CONSIDERED_append_microblaze = " qemu-usermode" + # File System Configuration IMAGE_FSTYPES ?= "tar.gz cpio cpio.gz.u-boot" IMAGE_CLASSES += "image_types_uboot" -- cgit v1.2.3-54-g00ecf