summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2012-04-10 09:20:08 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-11 12:10:14 +0100
commit0f21f39fad3717daef733fac3e9eb81976a3c866 (patch)
tree51b72c1e7a37e82e097c5c456f99617ea0cfd4d8
parent8c48ab6183934fd32600997cc33e0cd3bf63139b (diff)
downloadpoky-0f21f39fad3717daef733fac3e9eb81976a3c866.tar.gz
poky-0f21f39fad3717daef733fac3e9eb81976a3c866.tar.bz2
poky-0f21f39fad3717daef733fac3e9eb81976a3c866.zip
beagleboard.conf: fix hardcode of virtual/xserver
Here is the message from the bug 2260: meta-yocto/conf/machine/beagleboard.conf hardcodes the virtual/xserver provider, i.e., it includes the following: PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg-lite" I don't think machine conf is the correct place for selecting what is essentially a distro feature, but at least this should use the '?=' operator; as is to select a different provider one must provide a complete beagleboard.conf file. [YOCTO #2260] Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
-rw-r--r--meta-yocto/conf/machine/beagleboard.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf
index fa2f8e7a55..06a0ecd388 100644
--- a/meta-yocto/conf/machine/beagleboard.conf
+++ b/meta-yocto/conf/machine/beagleboard.conf
@@ -2,8 +2,8 @@
#@NAME: Beagleboard machine
#@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg-lite"
-XSERVER = "xserver-xorg-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg-lite"
+XSERVER ?= "xserver-xorg-lite \
xf86-input-evdev \
xf86-input-mouse \
xf86-video-omapfb \