From: Robert Bragg Date: Wed, 29 Oct 2008 17:18:38 +0000 (+0000) Subject: [netbook.conf] removes MACHINE_DRI_MODULES, use xf86-video-intel (not dri2) default X-Git-Tag: 2011-1~7899 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=8231fc119b4e0f9d041da810f2aeb0bd77e7dfc5;p=openembedded-core.git [netbook.conf] removes MACHINE_DRI_MODULES, use xf86-video-intel (not dri2) default MACHINE_DRI_MODULES is no longer used in the mesa recipe and the dri2 driver depends on dri2.h which depends on the xserver being built for dri2. Since the mesa package now splits up the dri drivers into seperate packages this adds mesa-dri-driver-i915 to XSERVER --- diff --git a/meta-moblin/conf/machine/netbook.conf b/meta-moblin/conf/machine/netbook.conf index 3165457409..25dd551a25 100644 --- a/meta-moblin/conf/machine/netbook.conf +++ b/meta-moblin/conf/machine/netbook.conf @@ -17,12 +17,13 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-moblin" 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 \ xf86-input-mouse \ xf86-input-keyboard \ xf86-input-synaptics \ - xf86-video-intel-dri2" -MACHINE_DRI_MODULES = "i915" + xf86-video-intel \ + mesa-dri-driver-i915" MACHINE_EXTRA_RDEPENDS = "rt2860"