From 97d28fee696de901caf6a8c6f22c9c4f31b8693c Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Wed, 12 Oct 2011 10:25:08 -0500 Subject: meta-fri2: xserver-xorg renaming updates Update fri2 and fri2-noemgd to reflect the new xserver-xorg naming. Signed-off-by: Tom Zanussi --- meta-fri2/conf/machine/fri2.conf | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'meta-fri2/conf/machine/fri2.conf') diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index eab4b505..e73d28fa 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf @@ -17,16 +17,22 @@ PREFERRED_VERSION_linux-yocto ?= "3.0%" PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" -XSERVER ?= "xserver-xf86-dri-lite \ +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" +XSERVER ?= "xserver-xorg \ + xserver-xorg-extension-dri \ + xserver-xorg-extension-dri2 \ + xserver-xorg-extension-glx \ + xserver-xorg-extension-extmod \ + xserver-xorg-extension-dbe \ + xserver-xorg-module-libint10 \ xf86-input-mouse \ xf86-input-keyboard \ xf86-input-evdev \ xf86-input-synaptics \ emgd-driver-bin" -PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3" +PREFERRED_VERSION_xserver-xorg ?= "1.9.3" PREFERRED_VERSION_emgd-driver-bin ?= "1.8" SERIAL_CONSOLE = "115200 ttyS0" -- cgit v1.2.3-54-g00ecf