diff options
author | Tom Zanussi <tom.zanussi@intel.com> | 2012-04-11 22:31:45 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-14 22:58:14 +0100 |
commit | 0258ba5e140cc9ca9f8a934ae7132be002bb537b (patch) | |
tree | 38ac309fae5dca1071713e38627c42be3a985040 /scripts | |
parent | 774afe86e877bef17c7b38be1cbee5609b89b319 (diff) | |
download | poky-0258ba5e140cc9ca9f8a934ae7132be002bb537b.tar.gz |
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}}.conf | 1 |
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}}" | |||
9 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" | 9 | PREFERRED_VERSION_{{=preferred_kernel}} ?= "{{=preferred_kernel_version}}%" |
10 | 10 | ||
11 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" | 11 | PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" |
12 | PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" | ||
12 | 13 | ||
13 | {{ input type:"choicelist" name:"qemuarch" prio:"5" msg:"Which qemu architecture would you like to use?" default:"i386" }} | 14 | {{ input type:"choicelist" name:"qemuarch" prio:"5" msg:"Which qemu architecture would you like to use?" default:"i386" }} |
14 | {{ input type:"choice" val:"i386" msg:"i386 (32-bit)" }} | 15 | {{ input type:"choice" val:"i386" msg:"i386 (32-bit)" }} |