From b92b776d56e64a437181de9bc76f8dcc8e15a5f8 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 12 Oct 2011 23:04:23 +0100 Subject: meta-yocto: Catch up with xserver and mesa upgrades/rename Signed-off-by: Richard Purdie --- meta-yocto/conf/machine/atom-pc.conf | 6 +++--- meta-yocto/recipes-graphics/mesa/mesa-dri_7.10.2.bbappend | 3 --- meta-yocto/recipes-graphics/mesa/mesa-dri_7.11.bbappend | 3 +++ 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 meta-yocto/recipes-graphics/mesa/mesa-dri_7.10.2.bbappend create mode 100644 meta-yocto/recipes-graphics/mesa/mesa-dri_7.11.bbappend (limited to 'meta-yocto') diff --git a/meta-yocto/conf/machine/atom-pc.conf b/meta-yocto/conf/machine/atom-pc.conf index da795cd430..734e5b5469 100644 --- a/meta-yocto/conf/machine/atom-pc.conf +++ b/meta-yocto/conf/machine/atom-pc.conf @@ -15,9 +15,9 @@ 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-lite" +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg-lite" +XSERVER ?= "xserver-xorg-lite \ xf86-input-mouse \ xf86-input-keyboard \ xf86-input-evdev \ diff --git a/meta-yocto/recipes-graphics/mesa/mesa-dri_7.10.2.bbappend b/meta-yocto/recipes-graphics/mesa/mesa-dri_7.10.2.bbappend deleted file mode 100644 index 61d3891663..0000000000 --- a/meta-yocto/recipes-graphics/mesa/mesa-dri_7.10.2.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -# Atom PCs have DRI support so use mesa-dri by default -DEFAULT_PREFERENCE_atom-pc = "1" - diff --git a/meta-yocto/recipes-graphics/mesa/mesa-dri_7.11.bbappend b/meta-yocto/recipes-graphics/mesa/mesa-dri_7.11.bbappend new file mode 100644 index 0000000000..61d3891663 --- /dev/null +++ b/meta-yocto/recipes-graphics/mesa/mesa-dri_7.11.bbappend @@ -0,0 +1,3 @@ +# Atom PCs have DRI support so use mesa-dri by default +DEFAULT_PREFERENCE_atom-pc = "1" + -- cgit v1.2.3-54-g00ecf