Skip to contentSkip to conversation

meta-intel: xserver-xorg rename fixes, v1

PATCH New [email protected] 1 participant 11 messages Oct 14, 2011

lore
Share & tools
lore
#0 lore raw

cover meta-intel: xserver-xorg rename fixes, v1

From: Tom Zanussi <[email protected]>

This patchset is a first pass at the fixes needed to fix up the server-xorg renaming in meta-intel and get X working again.

So far sugarbay and crownbay both with and without EMGD have been built and boot-tested successfully into sato.

One thing I don't yet understand though is why sugarbay worked fine with just the rename, while the crownbay BSPs needed to have the following added to XSERVER in order to get them to work.

+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 \

If anyone can give me a clue as to why that would be or how it's supposed to work, I'd appreciated it.

Thanks,

Tom

The following changes since commit 0ea04b02119c44865e5e1c2529c74950928c3347:
Eric Bénard (1):
meta-emenlow: update qt4 to 4.7.4

are available in the git repository at:

git://git.yoctoproject.org/meta-intel.git tzanussi/xorg-rename-fixes-v1
http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/commit/?h=tzanussi/xorg-rename-fixes-v1

Tom Zanussi (10):
meta-intel: /common xserver-xorg name change
meta-sugarbay: xserver-xorg rename
meta-sugarbay: remove meta-intel/common from BBFILES
meta-crownbay: xserver-xorg renaming updates
meta-fishriver: xserver-xorg renaming updates
meta-fri2: xserver-xorg renaming updates
meta-jasperforest: remove meta-intel/common from BBFILES
meta-jasperforest: xserver-xorg renaming updates
meta-jasperforest: remove obsolete xserver-xf86-dri-lite .bbappend
meta-n450: xserver-xorg renaming updates

 ...86-dri-lite_1.9.3.bb => xserver-xorg-1.9.3.inc} |   16 ++++++----------
 .../crosscompile.patch                             |    0
 .../fix_open_max_preprocessor_error.patch          |    0
 .../macro_tweak.patch                              |    0
 .../nodolt.patch                                   |    0
 .../xorg-xserver/xserver-xorg_1.9.3.bb             |    4 ++++
 meta-crownbay/conf/machine/crownbay-noemgd.conf    |   14 +++++++++++---
 meta-crownbay/conf/machine/crownbay.conf           |   14 ++++++++++----
 meta-fishriver/conf/machine/fishriver.conf         |    6 +++---
 meta-fri2/conf/machine/fri2-noemgd.conf            |    8 +++++---
 meta-fri2/conf/machine/fri2.conf                   |    8 ++++----
 meta-jasperforest/conf/layer.conf                  |    4 +---
 meta-jasperforest/conf/machine/jasperforest.conf   |    6 +++---
 .../xserver-xf86-dri-lite_1.9.3.bbappend           |    1 -
 meta-n450/conf/machine/n450.conf                   |    6 +++---
 meta-sugarbay/conf/layer.conf                      |    4 +---
 meta-sugarbay/conf/machine/sugarbay.conf           |    6 +++---
 17 files changed, 54 insertions(+), 43 deletions(-)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.9.3.bb => xserver-xorg-1.9.3.inc} (83%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg-1.9.3}/crosscompile.patch (100%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg-1.9.3}/fix_open_max_preprocessor_error.patch (100%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg-1.9.3}/macro_tweak.patch (100%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg-1.9.3}/nodolt.patch (100%)
 create mode 100644 common/recipes-graphics/xorg-xserver/xserver-xorg_1.9.3.bb
 delete mode 100644 meta-jasperforest/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bbappend
#1 lore raw

PATCH 1/10 meta-intel: /common xserver-xorg name change

From: Tom Zanussi <[email protected]>

xserver-xf86-dri-lite changed its name to xorg-xserver, so update the version in /common.

---
 ...86-dri-lite_1.9.3.bb => xserver-xorg-1.9.3.inc} |   16 ++++++----------
 .../crosscompile.patch                             |    0
 .../fix_open_max_preprocessor_error.patch          |    0
 .../macro_tweak.patch                              |    0
 .../nodolt.patch                                   |    0
 .../xorg-xserver/xserver-xorg_1.9.3.bb             |    4 ++++
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.9.3.bb => xserver-xorg-1.9.3.inc} (83%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg-1.9.3}/crosscompile.patch (100%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg-1.9.3}/fix_open_max_preprocessor_error.patch (100%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg-1.9.3}/macro_tweak.patch (100%)
 rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg-1.9.3}/nodolt.patch (100%)
 create mode 100644 common/recipes-graphics/xorg-xserver/xserver-xorg_1.9.3.bb
common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc renamed from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb +6 -10
similarity index 83%
rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb
rename to common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
index 81d70bc..888445d 100644
@@ -1,19 +1,15 @@
-require recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc
-
-PROTO_DEPS += "xf86driproto dri2proto"
-
-DEPENDS += "font-util"
-
-PE = "1"
-PR = "r0"
-
 SRC_URI += "file://nodolt.patch \
             file://crosscompile.patch"
 
 # Misc build failure for master HEAD
 SRC_URI += "file://fix_open_max_preprocessor_error.patch"
 
+PROTO_DEPS += "xf86driproto dri2proto"
+DEPENDS += "font-util"
+EXTRA_OECONF += "--enable-dri --enable-dri2 --enable-dga"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
+
 SRC_URI[md5sum] = "5bef6839a76d029204ab31aa2fcb5201"
 SRC_URI[sha256sum] = "864831f51e841ff37f2445d1c85b86b559c8860a435fb496aead4f256a2b141d"
 
-EXTRA_OECONF += "--enable-dri --enable-dri2 --enable-dga"
common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/crosscompile.patch renamed from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch +0 -0
similarity index 100%
rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch
rename to common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/crosscompile.patch
common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/fix_open_max_preprocessor_error.patch renamed from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch +0 -0
similarity index 100%
rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch
rename to common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/fix_open_max_preprocessor_error.patch
common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/macro_tweak.patch renamed from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch +0 -0
similarity index 100%
rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch
rename to common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/macro_tweak.patch
common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/nodolt.patch renamed from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch +0 -0
similarity index 100%
rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch
rename to common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/nodolt.patch
common/recipes-graphics/xorg-xserver/xserver-xorg_1.9.3.bb new file +4 -0
new file mode 100644
index 0000000..f62cad2
@@ -0,0 +1,4 @@
+require recipes-graphics/xorg-xserver/xserver-xorg.inc
+require xserver-xorg-${PV}.inc
+
+PE = "1"
Signature · 1 line
1.7.0.4
#2 lore raw

PATCH 2/10 meta-sugarbay: xserver-xorg rename

From: Tom Zanussi <[email protected]>

---
 meta-sugarbay/conf/machine/sugarbay.conf |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
meta-sugarbay/conf/machine/sugarbay.conf +3 -3
index 6277e20..5b7842a 100644
@@ -17,9 +17,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"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
Signature · 1 line
1.7.0.4
#3 lore raw

PATCH 3/10 meta-sugarbay: remove meta-intel/common from BBFILES

In reply to [email protected]

From: Tom Zanussi <[email protected]>

There's nothing in meta-intel/common used by sugarbay any longer, and is too broad anyway, so remove it from BBFILES.

---
 meta-sugarbay/conf/layer.conf |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
meta-sugarbay/conf/layer.conf +1 -3
index d5f78e1..05ef1cd 100644
@@ -3,9 +3,7 @@ BBPATH := "${BBPATH}:${LAYERDIR}"
 
 # We have a recipes directory, add to BBFILES
 BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
-	${LAYERDIR}/recipes-*/*/*.bbappend \
-	${LAYERDIR}/../common/recipes-*/*/*.bb \
-	${LAYERDIR}/../common/recipes-*/*/*.bbappend"
+	${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "sugarbay"
 BBFILE_PATTERN_sugarbay := "^${LAYERDIR}/"
Signature · 1 line
1.7.0.4
#4 lore raw

PATCH 4/10 meta-crownbay: xserver-xorg renaming updates

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Update crownbay and crownbay-noemgd to reflect the new xserver-xorg naming.

---
 meta-crownbay/conf/machine/crownbay-noemgd.conf |   14 +++++++++++---
 meta-crownbay/conf/machine/crownbay.conf        |   14 ++++++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)
meta-crownbay/conf/machine/crownbay-noemgd.conf +11 -3
index c668f4a..bde9a5f 100644
@@ -17,15 +17,23 @@ 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 \
            xf86-video-vesa"
 
+PREFERRED_VERSION_xserver-xorg ?= "1.11.1"
+
 SERIAL_CONSOLE = "115200 ttyS0"
 
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
meta-crownbay/conf/machine/crownbay.conf +10 -4
index 457bdfc..7f0b9d6 100644
@@ -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 \
            emgd-driver-bin \
            xf86-input-mouse \
            xf86-input-keyboard \
@@ -27,7 +33,7 @@ XSERVER ?= "xserver-xf86-dri-lite \
            xf86-input-synaptics \
            xf86-video-vesa"
 
-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"
Signature · 1 line
1.7.0.4
#5 lore raw

PATCH 5/10 meta-fishriver: xserver-xorg renaming updates

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Update fishriver to reflect the new xserver-xorg naming.

---
 meta-fishriver/conf/machine/fishriver.conf |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
meta-fishriver/conf/machine/fishriver.conf +3 -3
index 2fe78e8..ffbc05a 100644
@@ -17,9 +17,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"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
Signature · 1 line
1.7.0.4
#6 lore raw

PATCH 6/10 meta-fri2: xserver-xorg renaming updates

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Update fri2 and fri2-noemgd to reflect the new xserver-xorg naming.

---
 meta-fri2/conf/machine/fri2-noemgd.conf |    8 +++++---
 meta-fri2/conf/machine/fri2.conf        |    8 ++++----
 2 files changed, 9 insertions(+), 7 deletions(-)
meta-fri2/conf/machine/fri2-noemgd.conf +5 -3
index b02e037..98e92c5 100644
@@ -17,15 +17,17 @@ 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 \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
            xf86-input-synaptics \
            xf86-video-vesa"
 
+PREFERRED_VERSION_xserver-xorg ?= "1.11.1"
+
 SERIAL_CONSOLE = "115200 ttyS0"
 
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
meta-fri2/conf/machine/fri2.conf +4 -4
index eab4b50..363518d 100644
@@ -17,16 +17,16 @@ 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 \
            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"
Signature · 1 line
1.7.0.4
#7 lore raw

PATCH 7/10 meta-jasperforest: remove meta-intel/common from BBFILES

In reply to [email protected]

From: Tom Zanussi <[email protected]>

There's nothing in meta-intel/common used by jasperforest any longer, and is too broad anyway, so remove it from BBFILES.

---
 meta-jasperforest/conf/layer.conf |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
meta-jasperforest/conf/layer.conf +1 -3
index 8125659..bfd7fc3 100644
@@ -3,9 +3,7 @@ BBPATH := "${BBPATH}:${LAYERDIR}"
 
 # We have a recipes directory, add to BBFILES
 BBFILES := "${BBFILES} ${LAYERDIR}/recipes-*/*/*.bb \
-	${LAYERDIR}/recipes-*/*/*.bbappend \
-	${LAYERDIR}/../common/recipes-*/*/*.bb \
-	${LAYERDIR}/../common/recipes-*/*/*.bbappend"
+	${LAYERDIR}/recipes-*/*/*.bbappend"
 
 BBFILE_COLLECTIONS += "jasperforest"
 BBFILE_PATTERN_jasperforest := "^${LAYERDIR}/"
Signature · 1 line
1.7.0.4
#8 lore raw

PATCH 8/10 meta-jasperforest: xserver-xorg renaming updates

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Update jasperforest to reflect the new xserver-xorg naming.

---
 meta-jasperforest/conf/machine/jasperforest.conf |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
meta-jasperforest/conf/machine/jasperforest.conf +3 -3
index 9fdb968..f117860 100644
@@ -17,9 +17,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"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
Signature · 1 line
1.7.0.4
#9 lore raw

PATCH 9/10 meta-jasperforest: remove obsolete xserver-xf86-dri-lite .bbappend

In reply to [email protected]

From: Tom Zanussi <[email protected]>

The recipe and what it does no longer needed, so remove it.

---
 .../xserver-xf86-dri-lite_1.9.3.bbappend           |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
 delete mode 100644 meta-jasperforest/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bbappend
meta-jasperforest/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bbappend deleted +0 -1
deleted file mode 100644
index b2808ef..0000000
@@ -1 +0,0 @@
-EXTRA_OECONF += "--enable-dga"
Signature · 1 line
1.7.0.4
#10 lore raw

PATCH 10/10 meta-n450: xserver-xorg renaming updates

In reply to [email protected]

From: Tom Zanussi <[email protected]>

Update n450 to reflect the new xserver-xorg naming.

---
 meta-n450/conf/machine/n450.conf |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
meta-n450/conf/machine/n450.conf +3 -3
index 79970d1..ed9850a 100644
@@ -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"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
            xf86-input-mouse \
            xf86-input-keyboard \
            xf86-input-evdev \
Signature · 1 line
1.7.0.4