* [PATCH 01/10] meta-intel: /common xserver-xorg name change
2011-10-13 5:07 [PATCH 00/10] meta-intel: xserver-xorg rename fixes tom.zanussi
@ 2011-10-13 5:07 ` tom.zanussi
2011-10-13 5:07 ` [PATCH 02/10] meta-sugarbay: xserver-xorg rename tom.zanussi
` (8 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: tom.zanussi @ 2011-10-13 5:07 UTC (permalink / raw)
To: yocto
From: Tom Zanussi <tom.zanussi@intel.com>
xserver-xf86-dri-lite changed its name to xorg-xserver, so update the
version in /common.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
...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
diff --git a/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
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
--- a/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb
+++ b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
@@ -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"
diff --git a/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/crosscompile.patch
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
diff --git a/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/fix_open_max_preprocessor_error.patch b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/fix_open_max_preprocessor_error.patch
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
diff --git a/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/macro_tweak.patch
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
diff --git a/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3/nodolt.patch
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
diff --git a/common/recipes-graphics/xorg-xserver/xserver-xorg_1.9.3.bb b/common/recipes-graphics/xorg-xserver/xserver-xorg_1.9.3.bb
new file mode 100644
index 0000000..f62cad2
--- /dev/null
+++ b/common/recipes-graphics/xorg-xserver/xserver-xorg_1.9.3.bb
@@ -0,0 +1,4 @@
+require recipes-graphics/xorg-xserver/xserver-xorg.inc
+require xserver-xorg-${PV}.inc
+
+PE = "1"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 02/10] meta-sugarbay: xserver-xorg rename
2011-10-13 5:07 [PATCH 00/10] meta-intel: xserver-xorg rename fixes tom.zanussi
2011-10-13 5:07 ` [PATCH 01/10] meta-intel: /common xserver-xorg name change tom.zanussi
@ 2011-10-13 5:07 ` tom.zanussi
2011-10-13 5:07 ` [PATCH 03/10] meta-sugarbay: remove meta-intel/common from BBFILES tom.zanussi
` (7 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: tom.zanussi @ 2011-10-13 5:07 UTC (permalink / raw)
To: yocto
From: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-sugarbay/conf/machine/sugarbay.conf | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-sugarbay/conf/machine/sugarbay.conf b/meta-sugarbay/conf/machine/sugarbay.conf
index 6277e20..5b7842a 100644
--- a/meta-sugarbay/conf/machine/sugarbay.conf
+++ b/meta-sugarbay/conf/machine/sugarbay.conf
@@ -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 \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 03/10] meta-sugarbay: remove meta-intel/common from BBFILES
2011-10-13 5:07 [PATCH 00/10] meta-intel: xserver-xorg rename fixes tom.zanussi
2011-10-13 5:07 ` [PATCH 01/10] meta-intel: /common xserver-xorg name change tom.zanussi
2011-10-13 5:07 ` [PATCH 02/10] meta-sugarbay: xserver-xorg rename tom.zanussi
@ 2011-10-13 5:07 ` tom.zanussi
2011-10-13 5:07 ` [PATCH 04/10] meta-crownbay: xserver-xorg renaming updates tom.zanussi
` (6 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: tom.zanussi @ 2011-10-13 5:07 UTC (permalink / raw)
To: yocto
From: Tom Zanussi <tom.zanussi@intel.com>
There's nothing in meta-intel/common used by sugarbay any longer, and
is too broad anyway, so remove it from BBFILES.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-sugarbay/conf/layer.conf | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/meta-sugarbay/conf/layer.conf b/meta-sugarbay/conf/layer.conf
index d5f78e1..05ef1cd 100644
--- a/meta-sugarbay/conf/layer.conf
+++ b/meta-sugarbay/conf/layer.conf
@@ -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}/"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 00/10] meta-intel: xserver-xorg rename fixes
@ 2011-10-13 5:07 tom.zanussi
2011-10-13 5:07 ` [PATCH 01/10] meta-intel: /common xserver-xorg name change tom.zanussi
` (9 more replies)
0 siblings, 10 replies; 11+ messages in thread
From: tom.zanussi @ 2011-10-13 5:07 UTC (permalink / raw)
To: yocto
From: Tom Zanussi <tom.zanussi@intel.com>
This patchset is a first pass at the fixes needed to fix up the server-xorg
renaming in meta-intel.
So far sugarbay has been build and boot-tested successfully into sato.
crownbay has been build tested but failed to start X - in any case it
builds, which is a step forward. I applied the same changes to the other
BSPs but haven't yet built or booted them; I'll be doing that over the
next couple of days, but they should at least compile and not prevent
autobuilder from going green.
I did have one problem in that xf86-video-intel failed do_patch, and
had to respin the buidfix.patch as below, which doesn't make any sense
since I verified that the S = "${WORKDIR}/${BPN}-${PV}" assignment in
xorg-driver-common.inc was actually getting the right value for the
existing patch, and there shoule be no reason for it to fail. Anyway,
that's another thing I'll look into tomorrow if nobody else does.
Index: xf86-video-intel-2.16.0/src/intel.h
===================================================================
--- xf86-video-intel-2.16.0.orig/src/intel.h 2011-10-12 21:50:29.794427760 -0500
+++ xf86-video-intel-2.16.0/src/intel.h 2011-10-12 21:52:04.953637183 -0500
@@ -65,9 +65,7 @@
#include <pciaccess.h>
#include "xf86drm.h"
-#include "sarea.h"
#define _XF86DRI_SERVER_
-#include "dri.h"
#include "dri2.h"
#include "intel_bufmgr.h"
#include "i915_drm.h"
The following changes since commit e0e52850cf5f84fb4ee1bfa15571aaf61e068450:
Tom Zanussi (1):
meta-emenlow: restore /usr/lib/dri for xpsb-glx
are available in the git repository at:
git://git.yoctoproject.org/meta-intel.git tzanussi/xorg-rename-fixes-v0
http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/log/?h=tzanussi/xorg-rename-fixes-v0
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 | 6 +++---
meta-crownbay/conf/machine/crownbay.conf | 8 ++++----
meta-fishriver/conf/machine/fishriver.conf | 6 +++---
meta-fri2/conf/machine/fri2-noemgd.conf | 6 +++---
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, 38 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
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 04/10] meta-crownbay: xserver-xorg renaming updates
2011-10-13 5:07 [PATCH 00/10] meta-intel: xserver-xorg rename fixes tom.zanussi
` (2 preceding siblings ...)
2011-10-13 5:07 ` [PATCH 03/10] meta-sugarbay: remove meta-intel/common from BBFILES tom.zanussi
@ 2011-10-13 5:07 ` tom.zanussi
2011-10-13 5:07 ` [PATCH 05/10] meta-fishriver: " tom.zanussi
` (5 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: tom.zanussi @ 2011-10-13 5:07 UTC (permalink / raw)
To: yocto
From: Tom Zanussi <tom.zanussi@intel.com>
Update crownbay and crownbay-noemgd to reflect the new xserver-xorg
naming.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-crownbay/conf/machine/crownbay-noemgd.conf | 6 +++---
meta-crownbay/conf/machine/crownbay.conf | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf
index c668f4a..3b90136 100644
--- a/meta-crownbay/conf/machine/crownbay-noemgd.conf
+++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf
@@ -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 \
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index 457bdfc..41e94cb 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -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 \
emgd-driver-bin \
xf86-input-mouse \
xf86-input-keyboard \
@@ -27,7 +27,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"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 05/10] meta-fishriver: xserver-xorg renaming updates
2011-10-13 5:07 [PATCH 00/10] meta-intel: xserver-xorg rename fixes tom.zanussi
` (3 preceding siblings ...)
2011-10-13 5:07 ` [PATCH 04/10] meta-crownbay: xserver-xorg renaming updates tom.zanussi
@ 2011-10-13 5:07 ` tom.zanussi
2011-10-13 5:07 ` [PATCH 06/10] meta-fri2: " tom.zanussi
` (4 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: tom.zanussi @ 2011-10-13 5:07 UTC (permalink / raw)
To: yocto
From: Tom Zanussi <tom.zanussi@intel.com>
Update fishriver to reflect the new xserver-xorg naming.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-fishriver/conf/machine/fishriver.conf | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-fishriver/conf/machine/fishriver.conf b/meta-fishriver/conf/machine/fishriver.conf
index 2fe78e8..ffbc05a 100644
--- a/meta-fishriver/conf/machine/fishriver.conf
+++ b/meta-fishriver/conf/machine/fishriver.conf
@@ -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 \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 06/10] meta-fri2: xserver-xorg renaming updates
2011-10-13 5:07 [PATCH 00/10] meta-intel: xserver-xorg rename fixes tom.zanussi
` (4 preceding siblings ...)
2011-10-13 5:07 ` [PATCH 05/10] meta-fishriver: " tom.zanussi
@ 2011-10-13 5:07 ` tom.zanussi
2011-10-13 5:07 ` [PATCH 07/10] meta-jasperforest: remove meta-intel/common from BBFILES tom.zanussi
` (3 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: tom.zanussi @ 2011-10-13 5:07 UTC (permalink / raw)
To: yocto
From: Tom Zanussi <tom.zanussi@intel.com>
Update fri2 and fri2-noemgd to reflect the new xserver-xorg naming.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-fri2/conf/machine/fri2-noemgd.conf | 6 +++---
meta-fri2/conf/machine/fri2.conf | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/meta-fri2/conf/machine/fri2-noemgd.conf b/meta-fri2/conf/machine/fri2-noemgd.conf
index b02e037..11bb9bb 100644
--- a/meta-fri2/conf/machine/fri2-noemgd.conf
+++ b/meta-fri2/conf/machine/fri2-noemgd.conf
@@ -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 \
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index eab4b50..363518d 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -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"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 07/10] meta-jasperforest: remove meta-intel/common from BBFILES
2011-10-13 5:07 [PATCH 00/10] meta-intel: xserver-xorg rename fixes tom.zanussi
` (5 preceding siblings ...)
2011-10-13 5:07 ` [PATCH 06/10] meta-fri2: " tom.zanussi
@ 2011-10-13 5:07 ` tom.zanussi
2011-10-13 5:07 ` [PATCH 08/10] meta-jasperforest: xserver-xorg renaming updates tom.zanussi
` (2 subsequent siblings)
9 siblings, 0 replies; 11+ messages in thread
From: tom.zanussi @ 2011-10-13 5:07 UTC (permalink / raw)
To: yocto
From: Tom Zanussi <tom.zanussi@intel.com>
There's nothing in meta-intel/common used by jasperforest any longer,
and is too broad anyway, so remove it from BBFILES.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-jasperforest/conf/layer.conf | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/meta-jasperforest/conf/layer.conf b/meta-jasperforest/conf/layer.conf
index 8125659..bfd7fc3 100644
--- a/meta-jasperforest/conf/layer.conf
+++ b/meta-jasperforest/conf/layer.conf
@@ -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}/"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 08/10] meta-jasperforest: xserver-xorg renaming updates
2011-10-13 5:07 [PATCH 00/10] meta-intel: xserver-xorg rename fixes tom.zanussi
` (6 preceding siblings ...)
2011-10-13 5:07 ` [PATCH 07/10] meta-jasperforest: remove meta-intel/common from BBFILES tom.zanussi
@ 2011-10-13 5:07 ` tom.zanussi
2011-10-13 5:07 ` [PATCH 09/10] meta-jasperforest: remove obsolete xserver-xf86-dri-lite .bbappend tom.zanussi
2011-10-13 5:07 ` [PATCH 10/10] meta-n450: xserver-xorg renaming updates tom.zanussi
9 siblings, 0 replies; 11+ messages in thread
From: tom.zanussi @ 2011-10-13 5:07 UTC (permalink / raw)
To: yocto
From: Tom Zanussi <tom.zanussi@intel.com>
Update jasperforest to reflect the new xserver-xorg naming.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-jasperforest/conf/machine/jasperforest.conf | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-jasperforest/conf/machine/jasperforest.conf b/meta-jasperforest/conf/machine/jasperforest.conf
index 9fdb968..f117860 100644
--- a/meta-jasperforest/conf/machine/jasperforest.conf
+++ b/meta-jasperforest/conf/machine/jasperforest.conf
@@ -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 \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 09/10] meta-jasperforest: remove obsolete xserver-xf86-dri-lite .bbappend
2011-10-13 5:07 [PATCH 00/10] meta-intel: xserver-xorg rename fixes tom.zanussi
` (7 preceding siblings ...)
2011-10-13 5:07 ` [PATCH 08/10] meta-jasperforest: xserver-xorg renaming updates tom.zanussi
@ 2011-10-13 5:07 ` tom.zanussi
2011-10-13 5:07 ` [PATCH 10/10] meta-n450: xserver-xorg renaming updates tom.zanussi
9 siblings, 0 replies; 11+ messages in thread
From: tom.zanussi @ 2011-10-13 5:07 UTC (permalink / raw)
To: yocto
From: Tom Zanussi <tom.zanussi@intel.com>
The recipe and what it does no longer needed, so remove it.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
.../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
diff --git a/meta-jasperforest/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bbappend b/meta-jasperforest/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bbappend
deleted file mode 100644
index b2808ef..0000000
--- a/meta-jasperforest/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_OECONF += "--enable-dga"
--
1.7.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 10/10] meta-n450: xserver-xorg renaming updates
2011-10-13 5:07 [PATCH 00/10] meta-intel: xserver-xorg rename fixes tom.zanussi
` (8 preceding siblings ...)
2011-10-13 5:07 ` [PATCH 09/10] meta-jasperforest: remove obsolete xserver-xf86-dri-lite .bbappend tom.zanussi
@ 2011-10-13 5:07 ` tom.zanussi
9 siblings, 0 replies; 11+ messages in thread
From: tom.zanussi @ 2011-10-13 5:07 UTC (permalink / raw)
To: yocto
From: Tom Zanussi <tom.zanussi@intel.com>
Update n450 to reflect the new xserver-xorg naming.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
---
meta-n450/conf/machine/n450.conf | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta-n450/conf/machine/n450.conf b/meta-n450/conf/machine/n450.conf
index 79970d1..ed9850a 100644
--- a/meta-n450/conf/machine/n450.conf
+++ b/meta-n450/conf/machine/n450.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"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
xf86-input-mouse \
xf86-input-keyboard \
xf86-input-evdev \
--
1.7.0.4
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2011-10-13 5:07 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-13 5:07 [PATCH 00/10] meta-intel: xserver-xorg rename fixes tom.zanussi
2011-10-13 5:07 ` [PATCH 01/10] meta-intel: /common xserver-xorg name change tom.zanussi
2011-10-13 5:07 ` [PATCH 02/10] meta-sugarbay: xserver-xorg rename tom.zanussi
2011-10-13 5:07 ` [PATCH 03/10] meta-sugarbay: remove meta-intel/common from BBFILES tom.zanussi
2011-10-13 5:07 ` [PATCH 04/10] meta-crownbay: xserver-xorg renaming updates tom.zanussi
2011-10-13 5:07 ` [PATCH 05/10] meta-fishriver: " tom.zanussi
2011-10-13 5:07 ` [PATCH 06/10] meta-fri2: " tom.zanussi
2011-10-13 5:07 ` [PATCH 07/10] meta-jasperforest: remove meta-intel/common from BBFILES tom.zanussi
2011-10-13 5:07 ` [PATCH 08/10] meta-jasperforest: xserver-xorg renaming updates tom.zanussi
2011-10-13 5:07 ` [PATCH 09/10] meta-jasperforest: remove obsolete xserver-xf86-dri-lite .bbappend tom.zanussi
2011-10-13 5:07 ` [PATCH 10/10] meta-n450: xserver-xorg renaming updates tom.zanussi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.