From: Tom Zanussi <[email protected]> Update romley to reflect the new xserver-xorg naming.
Signed-off-by: Tom Zanussi <[email protected]> --- meta-romley/conf/machine/romley.conf | 12 +++++++++--- .../xorg-driver/xf86-video-mga_1.4.13.bb | 2 +- meta-sugarbay/conf/machine/sugarbay.conf | 4 +--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/meta-romley/conf/machine/romley.conf b/meta-romley/conf/machine/romley.conf index 3fae18d..625fa60 100644 --- a/meta-romley/conf/machine/romley.conf +++ b/meta-romley/conf/machine/romley.conf @@ -17,9 +17,15 @@ 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 \ diff --git a/meta-romley/recipes-graphics/xorg-driver/xf86-video-mga_1.4.13.bb b/meta-romley/recipes-graphics/xorg-driver/xf86-video-mga_1.4.13.bb index 9905a28..b48e56d 100755 --- a/meta-romley/recipes-graphics/xorg-driver/xf86-video-mga_1.4.13.bb +++ b/meta-romley/recipes-graphics/xorg-driver/xf86-video-mga_1.4.13.bb @@ -1,4 +1,4 @@ -require recipes-graphics/xorg-driver/xf86-video-common.inc +require recipes-graphics/xorg-driver/xorg-driver-video.inc SUMMARY = "X.Org X server -- Matrox MGA display driver" diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf index 3ea9ca3..c606cf4 100644 --- a/meta-sugarbay/conf/machine/sugarbay.conf +++ b/meta-sugarbay/conf/machine/sugarbay.conf @@ -30,9 +30,7 @@ XSERVER ?= "xserver-xorg \ xf86-input-keyboard \ xf86-input-evdev \ xf86-input-synaptics \ - xf86-video-intel \ - mesa-dri \ - mesa-dri-driver-i965" + mesa-dri" SERIAL_CONSOLE = "115200 ttyS0" -- 1.7.5.4 _______________________________________________ yocto mailing list [email protected] https://lists.yoctoproject.org/listinfo/yocto
