aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Sarbu <florin.sarbu@windriver.com>2012-12-11 10:07:46 +0200
committerFlorin Sarbu <florin.sarbu@windriver.com>2012-12-11 10:07:46 +0200
commitb1e752e7c7dfe9c79e0f506066a8c450b23104e6 (patch)
treec86edce3d950a1f1a9ee49bd31e91c497d01ff8a
parentd2c46874c1491fc0d1f7712bce4eb736dc0c9cc3 (diff)
downloadmeta-ivi-b1e752e7c7dfe9c79e0f506066a8c450b23104e6.tar.gz
meta-ivi-b1e752e7c7dfe9c79e0f506066a8c450b23104e6.tar.bz2
meta-ivi-b1e752e7c7dfe9c79e0f506066a8c450b23104e6.zip
Added the glx xorg extension to XSERVER variable.
Moved the XSERVER variable in the distro conf, rather than have it only in a machine conf. Signed-off-by: Florin Sarbu <florin.sarbu@windriver.com>
-rw-r--r--conf/distro/poky-ivi-systemd.conf14
-rw-r--r--conf/machine/vexpressa9.conf11
2 files changed, 14 insertions, 11 deletions
diff --git a/conf/distro/poky-ivi-systemd.conf b/conf/distro/poky-ivi-systemd.conf
index 065de17..013dd7e 100644
--- a/conf/distro/poky-ivi-systemd.conf
+++ b/conf/distro/poky-ivi-systemd.conf
@@ -10,3 +10,17 @@ include conf/distro/include/default-providers-ivi.inc
DISTRO_FEATURES += " bluetooth systemd opengl "
LAYER_CONF_VERSION = "6"
+
+XSERVER = "xserver-xorg \
+ xserver-xf86-config \
+ xserver-xorg-extension-dbe \
+ xserver-xorg-extension-dri \
+ xserver-xorg-extension-dri2 \
+ xserver-xorg-extension-extmod \
+ xserver-xorg-extension-glx \
+ xf86-input-evdev \
+ xf86-input-mouse \
+ xf86-video-fbdev \
+ xf86-input-keyboard \
+ mesa-dri-driver-swrast"
+
diff --git a/conf/machine/vexpressa9.conf b/conf/machine/vexpressa9.conf
index fbfefcb..d643cdd 100644
--- a/conf/machine/vexpressa9.conf
+++ b/conf/machine/vexpressa9.conf
@@ -3,17 +3,6 @@
#@DESCRIPTION: Machine configuration for the vexpress a9 board
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-XSERVER = "xserver-xorg \
- xserver-xf86-config \
- xserver-xorg-extension-dri \
- xserver-xorg-extension-dri2 \
- xserver-xorg-extension-extmod \
- xserver-xorg-extension-dbe \
- xf86-input-evdev \
- xf86-input-mouse \
- xf86-video-fbdev \
- xf86-input-keyboard \
- mesa-dri-driver-swrast"
# Ship all kernel modules by default
MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"