summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-yocto/conf/distro/poky.conf2
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta-yocto/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 062530d89d..ab01bbb52a 100644
--- a/meta-yocto/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
@@ -35,7 +35,7 @@ EXTRAOPKGCONFIG = "poky-feed-config-opkg"
35DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}" 35DISTRO_EXTRA_RDEPENDS += " ${POKY_DEFAULT_EXTRA_RDEPENDS}"
36DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}" 36DISTRO_EXTRA_RRECOMMENDS += " ${POKY_DEFAULT_EXTRA_RRECOMMENDS}"
37 37
38POKYQEMUDEPS = "${@base_contains("INCOMPATIBLE_LICENSE", "GPLv3", "", "qemu-config",d)}" 38POKYQEMUDEPS = "${@bb.utils.contains("INCOMPATIBLE_LICENSE", "GPLv3", "", "qemu-config",d)}"
39DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}" 39DISTRO_EXTRA_RDEPENDS_append_qemuarm = " ${POKYQEMUDEPS}"
40DISTRO_EXTRA_RDEPENDS_append_qemumips = " ${POKYQEMUDEPS}" 40DISTRO_EXTRA_RDEPENDS_append_qemumips = " ${POKYQEMUDEPS}"
41DISTRO_EXTRA_RDEPENDS_append_qemuppc = " ${POKYQEMUDEPS}" 41DISTRO_EXTRA_RDEPENDS_append_qemuppc = " ${POKYQEMUDEPS}"
diff --git a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf
index 782ac217d9..0f7ff62640 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf
@@ -47,7 +47,7 @@ MACHINE_FEATURES += "x86"
47KERNEL_IMAGETYPE = "bzImage" 47KERNEL_IMAGETYPE = "bzImage"
48SERIAL_CONSOLE = "115200 ttyS0" 48SERIAL_CONSOLE = "115200 ttyS0"
49XSERVER = "xserver-xorg \ 49XSERVER = "xserver-xorg \
50 ${@base_contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \ 50 ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast', '', d)} \
51 xf86-input-vmmouse \ 51 xf86-input-vmmouse \
52 xf86-input-keyboard \ 52 xf86-input-keyboard \
53 xf86-input-evdev \ 53 xf86-input-evdev \