diff options
Diffstat (limited to 'meta/conf/machine/include/qemu.inc')
-rw-r--r-- | meta/conf/machine/include/qemu.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 7d0a6fe458..bb7aec7675 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc | |||
@@ -3,10 +3,12 @@ PREFERRED_PROVIDER_virtual/egl ?= "mesa" | |||
3 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa" | 3 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa" |
4 | PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" | 4 | PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" |
5 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" | 5 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" |
6 | PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" | ||
6 | 7 | ||
7 | XSERVER ?= "xserver-xorg \ | 8 | XSERVER ?= "xserver-xorg \ |
8 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ | 9 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ |
9 | xf86-video-fbdev \ | 10 | xf86-video-fbdev \ |
11 | xf86-video-modesetting \ | ||
10 | " | 12 | " |
11 | 13 | ||
12 | MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat" | 14 | MACHINE_FEATURES = "alsa bluetooth usbgadget screen vfat" |
@@ -16,15 +18,13 @@ MACHINEOVERRIDES =. "qemuall:" | |||
16 | IMAGE_FSTYPES += "tar.bz2 ext4" | 18 | IMAGE_FSTYPES += "tar.bz2 ext4" |
17 | 19 | ||
18 | # Don't include kernels in standard images | 20 | # Don't include kernels in standard images |
19 | RDEPENDS_${KERNEL_PACKAGE_NAME}-base = "" | 21 | RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" |
20 | 22 | ||
21 | # Use a common kernel recipe for all QEMU machines | 23 | # Use a common kernel recipe for all QEMU machines |
22 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" | 24 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" |
23 | 25 | ||
24 | EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native" | ||
25 | |||
26 | # Provide the nfs server kernel module for all qemu images | 26 | # Provide the nfs server kernel module for all qemu images |
27 | KERNEL_FEATURES_append_pn-linux-yocto = " features/nfsd/nfsd-enable.scc" | 27 | KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" |
28 | KERNEL_FEATURES_append_pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc" | 28 | KERNEL_FEATURES:append:pn-linux-yocto-rt = " features/nfsd/nfsd-enable.scc" |
29 | 29 | ||
30 | IMAGE_CLASSES += "qemuboot" | 30 | IMAGE_CLASSES += "qemuboot" |