diff options
| author | Stefan Stanacar <stefanx.stanacar@intel.com> | 2012-11-16 18:37:27 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-11-18 16:42:10 +0000 |
| commit | 9acfef96333ffe6e08998e6fd69187c14532d26c (patch) | |
| tree | 7848ae5d5b99e63eeca96d0ac6430cbb20fc8997 /scripts/lib/bsp/substrate | |
| parent | a0123b0168dc805e200ec47a04ebc764f89ee83d (diff) | |
| download | ast2050-yocto-poky-9acfef96333ffe6e08998e6fd69187c14532d26c.zip ast2050-yocto-poky-9acfef96333ffe6e08998e6fd69187c14532d26c.tar.gz | |
yocto-bsp: update qemu machine.conf template
Update the template with the changes from the last commits to meta/conf/machine/qemux86.conf
Building sato image for a machine created using yocto-bsp with qemux86/x86-64 templates fails because nothing RPROVIDES qemugl anymore so remove support from the template as well.
Also drop redundant glibc configure knobs (they are no longer optional and they don't exist in conf/machine/qemux86.conf anymore so for consistency the template shouldn't keep them).
(From meta-yocto rev: 644c201a8fb9e589cdda1f76385a0b41549ea057)
Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/bsp/substrate')
| -rw-r--r-- | scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf | 5 |
1 files changed, 1 insertions, 4 deletions
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 d1f50c1..01e646d 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 @@ -44,11 +44,8 @@ XSERVER ?= "xserver-xorg \ xf86-input-vmmouse \ xf86-input-keyboard \ xf86-input-evdev \ - xf86-video-vmware \ - qemugl" + xf86-video-vmware" require conf/machine/include/qemu.inc -GLIBC_ADDONS = "nptl" -GLIBC_EXTRA_OECONF = "--with-tls" {{ if qemuarch == "arm": }} KERNEL_IMAGETYPE = "zImage" |
