* [PATCH 0/1] [meta-intel]fix to bug 1670
@ 2011-10-12 7:17 Dexuan Cui
2011-10-12 7:17 ` [PATCH 1/1] xserver-xf86-dri-lite: rename it to xserver-xorg Dexuan Cui
0 siblings, 1 reply; 8+ messages in thread
From: Dexuan Cui @ 2011-10-12 7:17 UTC (permalink / raw)
To: poky, tom.zanussi
The following changes since commit e0e52850cf5f84fb4ee1bfa15571aaf61e068450:
meta-emenlow: restore /usr/lib/dri for xpsb-glx (2011-10-10 08:22:54 -0500)
are available in the git repository at:
git://git.pokylinux.org/meta-intel-contrib dcui/fix_1670
http://git.pokylinux.org/cgit.cgi/meta-intel-contrib/log/?h=dcui/fix_1670
Dexuan Cui (1):
xserver-xf86-dri-lite: rename it to xserver-xorg
.../crosscompile.patch | 0
.../fix_open_max_preprocessor_error.patch | 0
.../macro_tweak.patch | 2 +-
.../nodolt.patch | 0
...86-dri-lite_1.9.3.bb => xserver-xorg_1.11.1.bb} | 2 +-
meta-crownbay/conf/machine/crownbay-noemgd.conf | 6 +++---
meta-crownbay/conf/machine/crownbay.conf | 8 ++++----
meta-emenlow/conf/machine/emenlow.conf | 2 +-
.../xorg-xserver/xserver-psb_1.7.99.2.bb | 2 +-
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/machine/jasperforest.conf | 6 +++---
meta-n450/conf/machine/n450.conf | 6 +++---
meta-sugarbay/conf/machine/sugarbay.conf | 6 +++---
15 files changed, 30 insertions(+), 30 deletions(-)
rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/crosscompile.patch (100%)
rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/fix_open_max_preprocessor_error.patch (100%)
rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/macro_tweak.patch (93%)
rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/nodolt.patch (100%)
rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.9.3.bb => xserver-xorg_1.11.1.bb} (87%)
--
1.7.6
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/1] xserver-xf86-dri-lite: rename it to xserver-xorg 2011-10-12 7:17 [PATCH 0/1] [meta-intel]fix to bug 1670 Dexuan Cui @ 2011-10-12 7:17 ` Dexuan Cui 2011-10-12 7:22 ` Martin Jansa 0 siblings, 1 reply; 8+ messages in thread From: Dexuan Cui @ 2011-10-12 7:17 UTC (permalink / raw) To: poky, tom.zanussi Recently poky's commit c09f0eb561a53b97a769dd0744076af7d904eafb (xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite) breaks BSP building. This patch makes changes accordingly. Fixes bug [YOCTO #1670] Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> Cc: Martin Jansa <Martin.Jansa@gmail.com> --- .../crosscompile.patch | 0 .../fix_open_max_preprocessor_error.patch | 0 .../macro_tweak.patch | 2 +- .../nodolt.patch | 0 ...86-dri-lite_1.9.3.bb => xserver-xorg_1.11.1.bb} | 2 +- meta-crownbay/conf/machine/crownbay-noemgd.conf | 6 +++--- meta-crownbay/conf/machine/crownbay.conf | 8 ++++---- meta-emenlow/conf/machine/emenlow.conf | 2 +- .../xorg-xserver/xserver-psb_1.7.99.2.bb | 2 +- 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/machine/jasperforest.conf | 6 +++--- meta-n450/conf/machine/n450.conf | 6 +++--- meta-sugarbay/conf/machine/sugarbay.conf | 6 +++--- 15 files changed, 30 insertions(+), 30 deletions(-) rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/crosscompile.patch (100%) rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/fix_open_max_preprocessor_error.patch (100%) rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/macro_tweak.patch (93%) rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/nodolt.patch (100%) rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.9.3.bb => xserver-xorg_1.11.1.bb} (87%) diff --git a/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch b/common/recipes-graphics/xorg-xserver/xserver-xorg/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/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/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/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/macro_tweak.patch similarity index 93% rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch rename to common/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch index 2b75427..2b32d4e 100644 --- a/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch +++ b/common/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch @@ -2,7 +2,7 @@ This is the revised version of files/macro_tweak.patch for xorg-server 1.8.99.904. the files/macro_tweak.patch can not removed now since it is used by -xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they +xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they are all upgraded to 1.8.99.904, the the files/macro_tweak.patch can be safely replace by this patch. diff --git a/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch b/common/recipes-graphics/xorg-xserver/xserver-xorg/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/nodolt.patch 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.11.1.bb similarity index 87% 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.11.1.bb index 81d70bc..480ed6a 100644 --- a/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb +++ b/common/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb @@ -1,4 +1,4 @@ -require recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc +require recipes-graphics/xorg-xserver/xserver-xorg.inc PROTO_DEPS += "xf86driproto dri2proto" 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..e293861 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.11.1" PREFERRED_VERSION_emgd-driver-bin ?= "1.8" SERIAL_CONSOLE = "115200 ttyS0" diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf index 9745531..dabc82d 100644 --- a/meta-emenlow/conf/machine/emenlow.conf +++ b/meta-emenlow/conf/machine/emenlow.conf @@ -21,7 +21,7 @@ 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_xserver-xf86-dri-lite = "xserver-psb" +PREFERRED_PROVIDER_xserver-xorg = "xserver-psb" XSERVER ?= "xserver-psb \ xf86-input-mouse \ diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb_1.7.99.2.bb b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb_1.7.99.2.bb index 5227faa..ccbed08 100644 --- a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb_1.7.99.2.bb +++ b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb_1.7.99.2.bb @@ -1,4 +1,4 @@ -require recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc +require recipes-graphics/xorg-xserver/xserver-xorg.inc PR = "r3" 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 \ 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..6ea78f4 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.11.1" PREFERRED_VERSION_emgd-driver-bin ?= "1.8" SERIAL_CONSOLE = "115200 ttyS0" 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 \ 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 \ 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.6 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] xserver-xf86-dri-lite: rename it to xserver-xorg 2011-10-12 7:17 ` [PATCH 1/1] xserver-xf86-dri-lite: rename it to xserver-xorg Dexuan Cui @ 2011-10-12 7:22 ` Martin Jansa 2011-10-12 7:26 ` Martin Jansa 0 siblings, 1 reply; 8+ messages in thread From: Martin Jansa @ 2011-10-12 7:22 UTC (permalink / raw) To: Dexuan Cui; +Cc: poky [-- Attachment #1: Type: text/plain, Size: 14205 bytes --] On Wed, Oct 12, 2011 at 03:17:53PM +0800, Dexuan Cui wrote: > Recently poky's commit c09f0eb561a53b97a769dd0744076af7d904eafb > (xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite) > breaks BSP building. > This patch makes changes accordingly. > > Fixes bug [YOCTO #1670] > > Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> > Cc: Martin Jansa <Martin.Jansa@gmail.com> > --- > .../crosscompile.patch | 0 > .../fix_open_max_preprocessor_error.patch | 0 > .../macro_tweak.patch | 2 +- > .../nodolt.patch | 0 > ...86-dri-lite_1.9.3.bb => xserver-xorg_1.11.1.bb} | 2 +- > meta-crownbay/conf/machine/crownbay-noemgd.conf | 6 +++--- > meta-crownbay/conf/machine/crownbay.conf | 8 ++++---- > meta-emenlow/conf/machine/emenlow.conf | 2 +- > .../xorg-xserver/xserver-psb_1.7.99.2.bb | 2 +- > 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/machine/jasperforest.conf | 6 +++--- > meta-n450/conf/machine/n450.conf | 6 +++--- > meta-sugarbay/conf/machine/sugarbay.conf | 6 +++--- > 15 files changed, 30 insertions(+), 30 deletions(-) > rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/crosscompile.patch (100%) > rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/fix_open_max_preprocessor_error.patch (100%) > rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/macro_tweak.patch (93%) > rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/nodolt.patch (100%) > rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.9.3.bb => xserver-xorg_1.11.1.bb} (87%) just curious, why there is whole xserver-xorg_1.11.1.bb recipe and patches not just small .bbappend? Regards, > > diff --git a/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch b/common/recipes-graphics/xorg-xserver/xserver-xorg/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/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/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/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/macro_tweak.patch > similarity index 93% > rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch > rename to common/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch > index 2b75427..2b32d4e 100644 > --- a/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch > +++ b/common/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch > @@ -2,7 +2,7 @@ This is the revised version of files/macro_tweak.patch for > xorg-server 1.8.99.904. > > the files/macro_tweak.patch can not removed now since it is used by > -xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they > +xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they > are all upgraded to 1.8.99.904, the the files/macro_tweak.patch > can be safely replace by this patch. > > diff --git a/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch b/common/recipes-graphics/xorg-xserver/xserver-xorg/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/nodolt.patch > 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.11.1.bb > similarity index 87% > 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.11.1.bb > index 81d70bc..480ed6a 100644 > --- a/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb > +++ b/common/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb > @@ -1,4 +1,4 @@ > -require recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc > +require recipes-graphics/xorg-xserver/xserver-xorg.inc > > PROTO_DEPS += "xf86driproto dri2proto" > > 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..e293861 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.11.1" > PREFERRED_VERSION_emgd-driver-bin ?= "1.8" > > SERIAL_CONSOLE = "115200 ttyS0" > diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf > index 9745531..dabc82d 100644 > --- a/meta-emenlow/conf/machine/emenlow.conf > +++ b/meta-emenlow/conf/machine/emenlow.conf > @@ -21,7 +21,7 @@ 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_xserver-xf86-dri-lite = "xserver-psb" > +PREFERRED_PROVIDER_xserver-xorg = "xserver-psb" > > XSERVER ?= "xserver-psb \ > xf86-input-mouse \ > diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb_1.7.99.2.bb b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb_1.7.99.2.bb > index 5227faa..ccbed08 100644 > --- a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb_1.7.99.2.bb > +++ b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb_1.7.99.2.bb > @@ -1,4 +1,4 @@ > -require recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc > +require recipes-graphics/xorg-xserver/xserver-xorg.inc > > PR = "r3" > > 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 \ > 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..6ea78f4 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.11.1" > PREFERRED_VERSION_emgd-driver-bin ?= "1.8" > > SERIAL_CONSOLE = "115200 ttyS0" > 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 \ > 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 \ > 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.6 > > _______________________________________________ > poky mailing list > poky@yoctoproject.org > https://lists.yoctoproject.org/listinfo/poky -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] xserver-xf86-dri-lite: rename it to xserver-xorg 2011-10-12 7:22 ` Martin Jansa @ 2011-10-12 7:26 ` Martin Jansa 2011-10-12 7:34 ` Cui, Dexuan 0 siblings, 1 reply; 8+ messages in thread From: Martin Jansa @ 2011-10-12 7:26 UTC (permalink / raw) To: Dexuan Cui; +Cc: poky [-- Attachment #1: Type: text/plain, Size: 15046 bytes --] On Wed, Oct 12, 2011 at 09:22:54AM +0200, Martin Jansa wrote: > On Wed, Oct 12, 2011 at 03:17:53PM +0800, Dexuan Cui wrote: > > Recently poky's commit c09f0eb561a53b97a769dd0744076af7d904eafb > > (xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite) > > breaks BSP building. > > This patch makes changes accordingly. > > > > Fixes bug [YOCTO #1670] > > > > Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> > > Cc: Martin Jansa <Martin.Jansa@gmail.com> > > --- > > .../crosscompile.patch | 0 > > .../fix_open_max_preprocessor_error.patch | 0 > > .../macro_tweak.patch | 2 +- > > .../nodolt.patch | 0 > > ...86-dri-lite_1.9.3.bb => xserver-xorg_1.11.1.bb} | 2 +- > > meta-crownbay/conf/machine/crownbay-noemgd.conf | 6 +++--- > > meta-crownbay/conf/machine/crownbay.conf | 8 ++++---- > > meta-emenlow/conf/machine/emenlow.conf | 2 +- > > .../xorg-xserver/xserver-psb_1.7.99.2.bb | 2 +- > > 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/machine/jasperforest.conf | 6 +++--- > > meta-n450/conf/machine/n450.conf | 6 +++--- > > meta-sugarbay/conf/machine/sugarbay.conf | 6 +++--- > > 15 files changed, 30 insertions(+), 30 deletions(-) > > rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/crosscompile.patch (100%) > > rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/fix_open_max_preprocessor_error.patch (100%) > > rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/macro_tweak.patch (93%) > > rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => xserver-xorg}/nodolt.patch (100%) > > rename common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.9.3.bb => xserver-xorg_1.11.1.bb} (87%) > > just curious, why there is whole xserver-xorg_1.11.1.bb recipe and > patches not just small .bbappend? looking at http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/tree/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb i don't know why it's here at all :) > > Regards, > > > > diff --git a/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/crosscompile.patch b/common/recipes-graphics/xorg-xserver/xserver-xorg/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/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/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/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/macro_tweak.patch > > similarity index 93% > > rename from common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch > > rename to common/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch > > index 2b75427..2b32d4e 100644 > > --- a/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/macro_tweak.patch > > +++ b/common/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch > > @@ -2,7 +2,7 @@ This is the revised version of files/macro_tweak.patch for > > xorg-server 1.8.99.904. > > > > the files/macro_tweak.patch can not removed now since it is used by > > -xserver-kdrive-1.7.99.2 and xserver-xf86-lite_1.7.99.2. Once they > > +xserver-kdrive-1.7.99.2 and xserver-xorg(-lite). Once they > > are all upgraded to 1.8.99.904, the the files/macro_tweak.patch > > can be safely replace by this patch. > > > > diff --git a/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite/nodolt.patch b/common/recipes-graphics/xorg-xserver/xserver-xorg/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/nodolt.patch > > 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.11.1.bb > > similarity index 87% > > 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.11.1.bb > > index 81d70bc..480ed6a 100644 > > --- a/common/recipes-graphics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb > > +++ b/common/recipes-graphics/xorg-xserver/xserver-xorg_1.11.1.bb > > @@ -1,4 +1,4 @@ > > -require recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc > > +require recipes-graphics/xorg-xserver/xserver-xorg.inc > > > > PROTO_DEPS += "xf86driproto dri2proto" > > > > 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..e293861 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.11.1" > > PREFERRED_VERSION_emgd-driver-bin ?= "1.8" > > > > SERIAL_CONSOLE = "115200 ttyS0" > > diff --git a/meta-emenlow/conf/machine/emenlow.conf b/meta-emenlow/conf/machine/emenlow.conf > > index 9745531..dabc82d 100644 > > --- a/meta-emenlow/conf/machine/emenlow.conf > > +++ b/meta-emenlow/conf/machine/emenlow.conf > > @@ -21,7 +21,7 @@ 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_xserver-xf86-dri-lite = "xserver-psb" > > +PREFERRED_PROVIDER_xserver-xorg = "xserver-psb" > > > > XSERVER ?= "xserver-psb \ > > xf86-input-mouse \ > > diff --git a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb_1.7.99.2.bb b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb_1.7.99.2.bb > > index 5227faa..ccbed08 100644 > > --- a/meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb_1.7.99.2.bb > > +++ b/meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb_1.7.99.2.bb > > @@ -1,4 +1,4 @@ > > -require recipes-graphics/xorg-xserver/xserver-xf86-dri-lite.inc > > +require recipes-graphics/xorg-xserver/xserver-xorg.inc > > > > PR = "r3" > > > > 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 \ > > 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..6ea78f4 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.11.1" > > PREFERRED_VERSION_emgd-driver-bin ?= "1.8" > > > > SERIAL_CONSOLE = "115200 ttyS0" > > 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 \ > > 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 \ > > 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.6 > > > > _______________________________________________ > > poky mailing list > > poky@yoctoproject.org > > https://lists.yoctoproject.org/listinfo/poky > > -- > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] xserver-xf86-dri-lite: rename it to xserver-xorg 2011-10-12 7:26 ` Martin Jansa @ 2011-10-12 7:34 ` Cui, Dexuan 2011-10-12 12:12 ` Martin Jansa 0 siblings, 1 reply; 8+ messages in thread From: Cui, Dexuan @ 2011-10-12 7:34 UTC (permalink / raw) To: Martin Jansa; +Cc: poky@yoctoproject.org Martin Jansa wrote on 2011-10-12: > On Wed, Oct 12, 2011 at 09:22:54AM +0200, Martin Jansa wrote: >> On Wed, Oct 12, 2011 at 03:17:53PM +0800, Dexuan Cui wrote: >>> Recently poky's commit c09f0eb561a53b97a769dd0744076af7d904eafb >>> (xserver-xf86(-dri)-lite: rename to xserver-xorg and >>> xserver-xorg-lite) breaks BSP building. >>> This patch makes changes accordingly. >>> common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => >>> xserver-xorg}/nodolt.patch (100%) rename >>> common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.9.3. >>> bb >>> => xserver-xorg_1.11.1.bb} (87%) >> >> just curious, why there is whole xserver-xorg_1.11.1.bb recipe and >> patches not just small .bbappend? Yes, it seems strange to me, too. I suppose Tom may know the history? > looking at > http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel/tree/common/recip > es-grap hics/xorg-xserver/xserver-xf86-dri-lite_1.9.3.bb i don't know > why it's here at all :) Thanks, -- Dexuan ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] xserver-xf86-dri-lite: rename it to xserver-xorg 2011-10-12 7:34 ` Cui, Dexuan @ 2011-10-12 12:12 ` Martin Jansa 2011-10-12 12:36 ` Paul Eggleton 2011-10-12 13:11 ` Tom Zanussi 0 siblings, 2 replies; 8+ messages in thread From: Martin Jansa @ 2011-10-12 12:12 UTC (permalink / raw) To: Cui, Dexuan; +Cc: poky@yoctoproject.org [-- Attachment #1: Type: text/plain, Size: 3323 bytes --] On Wed, Oct 12, 2011 at 03:34:56PM +0800, Cui, Dexuan wrote: > Martin Jansa wrote on 2011-10-12: > > On Wed, Oct 12, 2011 at 09:22:54AM +0200, Martin Jansa wrote: > >> On Wed, Oct 12, 2011 at 03:17:53PM +0800, Dexuan Cui wrote: > >>> Recently poky's commit c09f0eb561a53b97a769dd0744076af7d904eafb > >>> (xserver-xf86(-dri)-lite: rename to xserver-xorg and > >>> xserver-xorg-lite) breaks BSP building. > >>> This patch makes changes accordingly. > >>> common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => > >>> xserver-xorg}/nodolt.patch (100%) rename > >>> common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.9.3. > >>> bb > >>> => xserver-xorg_1.11.1.bb} (87%) > >> > >> just curious, why there is whole xserver-xorg_1.11.1.bb recipe and > >> patches not just small .bbappend? > Yes, it seems strange to me, too. > I suppose Tom may know the history? Maybe it's because of extra --enable-dga which is by default disabled in xserver-xorg-common, but maybe we can enable it by default and keep it disabled only for xserver-xorg-lite as in attached patch (which would need PR bump too). Regards, From b5bbb8e8860708c9e07370595176c52a57ddc18e Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 12 Oct 2011 14:10:16 +0200 Subject: [PATCH] xserver-xorg: disable DGA only in -lite version, and force it enabled in xserver-xorg Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- .../xorg-xserver/xserver-xorg-common.inc | 1 - .../xorg-xserver/xserver-xorg-lite.inc | 1 + .../recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 + 3 files changed, 2 insertions(+), 1 deletions(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc index a8c7b0a..4d82d79 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc @@ -98,7 +98,6 @@ EXTRA_OECONF += "--with-fop=no \ --disable-acfb \ --disable-ccfb \ --disable-mcfb \ - --disable-dga \ --disable-xinerama \ --disable-xf86misc \ --disable-xorgcfg \ diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc index be84e9e..57615f5 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc @@ -3,4 +3,5 @@ require xserver-xorg-common.inc EXTRA_OECONF += "\ --disable-dri \ --disable-glx \ + --disable-dga \ " diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 01cdd68..0f34c1a 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -8,6 +8,7 @@ require ../mesa/glx-use-tls.inc EXTRA_OECONF += "\ --enable-dri \ --enable-dri2 \ + --enable-dga \ --with-pic \ --with-int10=x86emu \ " -- 1.7.7 [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 205 bytes --] ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] xserver-xf86-dri-lite: rename it to xserver-xorg 2011-10-12 12:12 ` Martin Jansa @ 2011-10-12 12:36 ` Paul Eggleton 2011-10-12 13:11 ` Tom Zanussi 1 sibling, 0 replies; 8+ messages in thread From: Paul Eggleton @ 2011-10-12 12:36 UTC (permalink / raw) To: poky On Wednesday 12 October 2011 13:12:50 Martin Jansa wrote: > Maybe it's because of extra > --enable-dga which is by default disabled in xserver-xorg-common, but > maybe we can enable it by default and keep it disabled only for > xserver-xorg-lite as in attached patch (which would need PR bump too). I meant to ask about this earlier - do we really still need DGA? Last I heard, and even that was some years ago, DGA was pretty ancient and the advice was it should no longer be used. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 1/1] xserver-xf86-dri-lite: rename it to xserver-xorg 2011-10-12 12:12 ` Martin Jansa 2011-10-12 12:36 ` Paul Eggleton @ 2011-10-12 13:11 ` Tom Zanussi 1 sibling, 0 replies; 8+ messages in thread From: Tom Zanussi @ 2011-10-12 13:11 UTC (permalink / raw) To: Martin Jansa; +Cc: poky@yoctoproject.org On Wed, 2011-10-12 at 05:12 -0700, Martin Jansa wrote: > On Wed, Oct 12, 2011 at 03:34:56PM +0800, Cui, Dexuan wrote: > > Martin Jansa wrote on 2011-10-12: > > > On Wed, Oct 12, 2011 at 09:22:54AM +0200, Martin Jansa wrote: > > >> On Wed, Oct 12, 2011 at 03:17:53PM +0800, Dexuan Cui wrote: > > >>> Recently poky's commit c09f0eb561a53b97a769dd0744076af7d904eafb > > >>> (xserver-xf86(-dri)-lite: rename to xserver-xorg and > > >>> xserver-xorg-lite) breaks BSP building. > > >>> This patch makes changes accordingly. > > >>> common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite => > > >>> xserver-xorg}/nodolt.patch (100%) rename > > >>> common/recipes-graphics/xorg-xserver/{xserver-xf86-dri-lite_1.9.3. > > >>> bb > > >>> => xserver-xorg_1.11.1.bb} (87%) > > >> > > >> just curious, why there is whole xserver-xorg_1.11.1.bb recipe and > > >> patches not just small .bbappend? > > Yes, it seems strange to me, too. > > I suppose Tom may know the history? > > Maybe it's because of extra > --enable-dga which is by default disabled in xserver-xorg-common, but > maybe we can enable it by default and keep it disabled only for > xserver-xorg-lite as in attached patch (which would need PR bump too). > The reason it's there is that 1.9.3 is required for EMGD, used by the meta-intel BSPS. EMGD is very particular about versions and won't work with e.g. 1.11.1. Tom > Regards, > > From b5bbb8e8860708c9e07370595176c52a57ddc18e Mon Sep 17 00:00:00 2001 > From: Martin Jansa <Martin.Jansa@gmail.com> > Date: Wed, 12 Oct 2011 14:10:16 +0200 > Subject: [PATCH] xserver-xorg: disable DGA only in -lite version, and force > it enabled in xserver-xorg > > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> > --- > .../xorg-xserver/xserver-xorg-common.inc | 1 - > .../xorg-xserver/xserver-xorg-lite.inc | 1 + > .../recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 + > 3 files changed, 2 insertions(+), 1 deletions(-) > > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc > index a8c7b0a..4d82d79 100644 > --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc > @@ -98,7 +98,6 @@ EXTRA_OECONF += "--with-fop=no \ > --disable-acfb \ > --disable-ccfb \ > --disable-mcfb \ > - --disable-dga \ > --disable-xinerama \ > --disable-xf86misc \ > --disable-xorgcfg \ > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc > index be84e9e..57615f5 100644 > --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-lite.inc > @@ -3,4 +3,5 @@ require xserver-xorg-common.inc > EXTRA_OECONF += "\ > --disable-dri \ > --disable-glx \ > + --disable-dga \ > " > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc > index 01cdd68..0f34c1a 100644 > --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc > @@ -8,6 +8,7 @@ require ../mesa/glx-use-tls.inc > EXTRA_OECONF += "\ > --enable-dri \ > --enable-dri2 \ > + --enable-dga \ > --with-pic \ > --with-int10=x86emu \ > " ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2011-10-12 13:11 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-10-12 7:17 [PATCH 0/1] [meta-intel]fix to bug 1670 Dexuan Cui 2011-10-12 7:17 ` [PATCH 1/1] xserver-xf86-dri-lite: rename it to xserver-xorg Dexuan Cui 2011-10-12 7:22 ` Martin Jansa 2011-10-12 7:26 ` Martin Jansa 2011-10-12 7:34 ` Cui, Dexuan 2011-10-12 12:12 ` Martin Jansa 2011-10-12 12:36 ` Paul Eggleton 2011-10-12 13:11 ` 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.