summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2012-04-11 22:31:45 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-14 22:58:14 +0100
commit0258ba5e140cc9ca9f8a934ae7132be002bb537b (patch)
tree38ac309fae5dca1071713e38627c42be3a985040 /scripts
parent774afe86e877bef17c7b38be1cbee5609b89b319 (diff)
downloadpoky-0258ba5e140cc9ca9f8a934ae7132be002bb537b.tar.gz
poky-0258ba5e140cc9ca9f8a934ae7132be002bb537b.tar.bz2
poky-0258ba5e140cc9ca9f8a934ae7132be002bb537b.zip
yocto-bsp: fix multi-provider error in qemu arch template
While testing the fix for [YOCTO #2222] I noticed a new build error that wasn't there in previous testing: ERROR: Multiple .bb files are due to be built which each provide virtual/libgl The build still completed and produced a good image, but an error message was displayed, which this patch removes. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf1
1 files changed, 1 insertions, 0 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 003ead198c..61ba8429e7 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
@@ -9,6 +9,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "{{=preferred_kernel}}"
PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
{{ input type:"choicelist" name:"qemuarch" prio:"5" msg:"Which qemu architecture would you like to use?" default:"i386" }}
{{ input type:"choice" val:"i386" msg:"i386 (32-bit)" }}