diff options
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/machine/include/qemu.inc | 1 | ||||
| -rw-r--r-- | meta/conf/machine/qemuppc.conf | 2 | ||||
| -rw-r--r-- | meta/conf/machine/qemux86-64.conf | 3 | ||||
| -rw-r--r-- | meta/conf/machine/qemux86.conf | 3 |
4 files changed, 0 insertions, 9 deletions
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index 9ef242f386..3cebfab669 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc | |||
| @@ -12,6 +12,5 @@ RDEPENDS_kernel-base = "" | |||
| 12 | 12 | ||
| 13 | # Use a common kernel recipe for all QEMU machines | 13 | # Use a common kernel recipe for all QEMU machines |
| 14 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" | 14 | PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto" |
| 15 | #PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" | ||
| 16 | 15 | ||
| 17 | EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" | 16 | EXTRA_IMAGEDEPENDS += "qemu-native qemu-helper-native" |
diff --git a/meta/conf/machine/qemuppc.conf b/meta/conf/machine/qemuppc.conf index dacc802ef0..bcc408f4de 100644 --- a/meta/conf/machine/qemuppc.conf +++ b/meta/conf/machine/qemuppc.conf | |||
| @@ -2,8 +2,6 @@ | |||
| 2 | #@NAME: qemu PPC Emulator setup | 2 | #@NAME: qemu PPC Emulator setup |
| 3 | #@DESCRIPTION: Machine configuration for running an PPC system under qemu emulation | 3 | #@DESCRIPTION: Machine configuration for running an PPC system under qemu emulation |
| 4 | 4 | ||
| 5 | PREFERRED_PROVIDER_virtual/libgl = "mesa-xlib" | ||
| 6 | |||
| 7 | require conf/machine/include/qemu.inc | 5 | require conf/machine/include/qemu.inc |
| 8 | require conf/machine/include/tune-ppc603e.inc | 6 | require conf/machine/include/tune-ppc603e.inc |
| 9 | 7 | ||
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index f28cf0819b..73a404398b 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf | |||
| @@ -2,10 +2,7 @@ | |||
| 2 | #@NAME: common_pc | 2 | #@NAME: common_pc |
| 3 | #@DESCRIPTION: Machine configuration for running a common x86 | 3 | #@DESCRIPTION: Machine configuration for running a common x86 |
| 4 | 4 | ||
| 5 | PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" | ||
| 6 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" | ||
| 7 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 5 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
| 8 | PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" | ||
| 9 | 6 | ||
| 10 | require conf/machine/include/tune-x86_64.inc | 7 | require conf/machine/include/tune-x86_64.inc |
| 11 | require conf/machine/include/qemu.inc | 8 | require conf/machine/include/qemu.inc |
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf index 75c9042eb5..3edfe290a6 100644 --- a/meta/conf/machine/qemux86.conf +++ b/meta/conf/machine/qemux86.conf | |||
| @@ -2,10 +2,7 @@ | |||
| 2 | #@NAME: common_pc | 2 | #@NAME: common_pc |
| 3 | #@DESCRIPTION: Machine configuration for running a common x86 | 3 | #@DESCRIPTION: Machine configuration for running a common x86 |
| 4 | 4 | ||
| 5 | PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" | ||
| 6 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" | ||
| 7 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 5 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
| 8 | PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" | ||
| 9 | 6 | ||
| 10 | require conf/machine/include/tune-i586.inc | 7 | require conf/machine/include/tune-i586.inc |
| 11 | require conf/machine/include/qemu.inc | 8 | require conf/machine/include/qemu.inc |