diff options
Diffstat (limited to 'meta/conf/machine')
| -rw-r--r-- | meta/conf/machine/include/qemu.inc | 7 | ||||
| -rw-r--r-- | meta/conf/machine/qemux86-64.conf | 6 | ||||
| -rw-r--r-- | meta/conf/machine/qemux86.conf | 6 |
3 files changed, 0 insertions, 19 deletions
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index d7392d4762..c143e37f71 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc | |||
| @@ -1,10 +1,3 @@ | |||
| 1 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | ||
| 2 | PREFERRED_PROVIDER_virtual/egl ?= "mesa" | ||
| 3 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa" | ||
| 4 | PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" | ||
| 5 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" | ||
| 6 | PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" | ||
| 7 | |||
| 8 | XSERVER ?= "xserver-xorg \ | 1 | XSERVER ?= "xserver-xorg \ |
| 9 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ | 2 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'mesa-driver-swrast xserver-xorg-extension-glx', '', d)} \ |
| 10 | xf86-video-fbdev \ | 3 | xf86-video-fbdev \ |
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 4a9c6d364b..62108b703b 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf | |||
| @@ -2,12 +2,6 @@ | |||
| 2 | #@NAME: QEMU x86-64 machine | 2 | #@NAME: QEMU x86-64 machine |
| 3 | #@DESCRIPTION: Machine configuration for running an x86-64 system on QEMU | 3 | #@DESCRIPTION: Machine configuration for running an x86-64 system on QEMU |
| 4 | 4 | ||
| 5 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | ||
| 6 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa" | ||
| 7 | PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" | ||
| 8 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" | ||
| 9 | PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" | ||
| 10 | |||
| 11 | require conf/machine/include/qemu.inc | 5 | require conf/machine/include/qemu.inc |
| 12 | DEFAULTTUNE ?= "core2-64" | 6 | DEFAULTTUNE ?= "core2-64" |
| 13 | require conf/machine/include/x86/tune-x86-64-v3.inc | 7 | require conf/machine/include/x86/tune-x86-64-v3.inc |
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 1e072e1ae2..51f080bd2a 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf | |||
| @@ -2,12 +2,6 @@ | |||
| 2 | #@NAME: QEMU x86 machine | 2 | #@NAME: QEMU x86 machine |
| 3 | #@DESCRIPTION: Machine configuration for running an x86 system on QEMU | 3 | #@DESCRIPTION: Machine configuration for running an x86 system on QEMU |
| 4 | 4 | ||
| 5 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | ||
| 6 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa" | ||
| 7 | PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa" | ||
| 8 | PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa" | ||
| 9 | PREFERRED_PROVIDER_virtual/libgles3 ?= "mesa" | ||
| 10 | |||
| 11 | require conf/machine/include/qemu.inc | 5 | require conf/machine/include/qemu.inc |
| 12 | DEFAULTTUNE ?= "core2-32" | 6 | DEFAULTTUNE ?= "core2-32" |
| 13 | require conf/machine/include/x86/tune-corei7.inc | 7 | require conf/machine/include/x86/tune-corei7.inc |