From ba97cb7d2dddf3e86e38752d2bce9ff2661d390f Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 15 Nov 2011 16:45:35 -0600 Subject: meta-intel: remove virtual/xserver-xf86 references These are now deprecated (in favor of just virtual/xserver), so remove them. Signed-off-by: Tom Zanussi --- meta-crownbay/conf/machine/crownbay-noemgd.conf | 1 - meta-crownbay/conf/machine/crownbay.conf | 1 - meta-emenlow/conf/machine/emenlow.conf | 1 - meta-fishriver/conf/machine/fishriver.conf | 1 - meta-fri2/conf/machine/fri2-noemgd.conf | 1 - meta-fri2/conf/machine/fri2.conf | 1 - meta-jasperforest/conf/machine/jasperforest.conf | 1 - meta-n450/conf/machine/n450.conf | 1 - meta-romley/conf/machine/romley.conf | 1 - meta-sugarbay/conf/machine/sugarbay.conf | 1 - 10 files changed, 10 deletions(-) diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf index f61c75aa..aa9e7328 100644 --- a/meta-crownbay/conf/machine/crownbay-noemgd.conf +++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf @@ -18,7 +18,6 @@ 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-xorg" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-dri \ xserver-xorg-extension-dri2 \ diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf index defa4e5a..9315e82f 100644 --- a/meta-crownbay/conf/machine/crownbay.conf +++ b/meta-crownbay/conf/machine/crownbay.conf @@ -18,7 +18,6 @@ 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-xorg" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-dri \ xserver-xorg-extension-dri2 \ diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf index 774ef08f..06cba370 100644 --- a/meta-emenlow/conf/machine/emenlow.conf +++ b/meta-emenlow/conf/machine/emenlow.conf @@ -20,7 +20,6 @@ PREFERRED_PROVIDER_drm = "libdrm-poulsbo" PREFERRED_PROVIDER_virtual/libx11 = "libx11-trim" PREFERRED_PROVIDER_virtual/libgl = "xpsb-glx" PREFERRED_PROVIDER_virtual/xserver = "xserver-psb" -PREFERRED_PROVIDER_virtual/xserver-xf86 = "xserver-psb" PREFERRED_PROVIDER_mesa-dri = "xpsb-glx" XSERVER ?= "xserver-psb \ xserver-psb-extension-dri \ diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf index 79bf349d..8cc43f87 100644 --- a/meta-fishriver/conf/machine/fishriver.conf +++ b/meta-fishriver/conf/machine/fishriver.conf @@ -18,7 +18,6 @@ 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-xorg" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-dri \ xserver-xorg-extension-dri2 \ diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf index 089861f8..d70e06ff 100644 --- a/meta-fri2/conf/machine/fri2-noemgd.conf +++ b/meta-fri2/conf/machine/fri2-noemgd.conf @@ -18,7 +18,6 @@ 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-xorg" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-dri \ xserver-xorg-extension-dri2 \ diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf index 6029cee5..80fa43b9 100644 --- a/meta-fri2/conf/machine/fri2.conf +++ b/meta-fri2/conf/machine/fri2.conf @@ -18,7 +18,6 @@ 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-xorg" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-dri \ xserver-xorg-extension-dri2 \ diff --git a/meta-jasperforest/conf/machine/jasperforest.conf b/meta-jasperforest/conf/machine/jasperforest.conf index 17468de7..c668c640 100644 --- a/meta-jasperforest/conf/machine/jasperforest.conf +++ b/meta-jasperforest/conf/machine/jasperforest.conf @@ -18,7 +18,6 @@ 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-xorg" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-dri \ xserver-xorg-extension-dri2 \ diff --git a/meta-n450/conf/machine/n450.conf b/meta-n450/conf/machine/n450.conf index 431a6c51..b28f57f3 100644 --- a/meta-n450/conf/machine/n450.conf +++ b/meta-n450/conf/machine/n450.conf @@ -16,7 +16,6 @@ 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-xorg" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-dri \ xserver-xorg-extension-dri2 \ diff --git a/meta-romley/conf/machine/romley.conf b/meta-romley/conf/machine/romley.conf index 2dcb5db9..3d41db59 100644 --- a/meta-romley/conf/machine/romley.conf +++ b/meta-romley/conf/machine/romley.conf @@ -18,7 +18,6 @@ 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-xorg" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-dri \ xserver-xorg-extension-dri2 \ diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf index 3ea9ca3f..0b4541f5 100644 --- a/meta-sugarbay/conf/machine/sugarbay.conf +++ b/meta-sugarbay/conf/machine/sugarbay.conf @@ -18,7 +18,6 @@ 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-xorg" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" XSERVER ?= "xserver-xorg \ xserver-xorg-extension-dri \ xserver-xorg-extension-dri2 \ -- cgit v1.2.3-54-g00ecf