Fixes for rescent X breakages in meta-intel layer

PATCH In review [email protected] 3 participants 11 messages Nov 28, 2012 – Dec 2, 2012

lore

Share & tools

lore

[email protected]

author

2012-11-28 18:37 UTC #0 lore raw

cover Fixes for rescent X breakages in meta-intel layer

From: Nitin A Kamble <[email protected]>

This commits are for meta-intel layer. And Ross'es patch tries to achieve the same from the oecore layer.

Thanks,
Nitin

The following changes since commit 154156a4db56f7b33fb1765cf6b87e683d027af9:

emgd-driver-bin: add further needed soft links (2012-11-26 18:02:11 -0600)

are available in the git repository at:
git://git.yoctoproject.org/meta-intel-contrib nitin/misc
http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=nitin/misc

Nitin A Kamble (3):
xserver-xorg-1.9.3: fix packaging issues
xserver-psb: fix packaging issues
xserver-xorg-video-psb: fix packaging issues

 .../xorg-xserver/xserver-xorg-1.9.3.inc            |    2 +-
 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |  160 ++++++++++++++++++++
 .../xorg-xserver/xserver-xorg_1.9.3.bb             |    2 +-
 conf/machine/include/meta-intel.inc                |   10 +-
 .../xorg-xserver/xserver-psb-1.7.99.2.inc          |    2 +-
 .../xorg-xserver/xserver-psb_1.7.99.2.bb           |    2 +-
 .../xserver-xorg-video-psb_0.32.1.bb               |    8 +-
 7 files changed, 180 insertions(+), 6 deletions(-)
 create mode 100644 common/recipes-graphics/xorg-xserver/xserver-xorg.inc

Signature · 1 line

1.7.3.4

[email protected]

author

2012-11-28 18:37 UTC #1 lore raw

PATCH 1/3 xserver-xorg-1.9.3: fix packaging issues

From: Nitin A Kamble <[email protected]>

This was affecting crownbay BSP. And it may also be affecting fri2, sys940x BSPs. And this commit will fix the issues for all these EMGD based BSPs.

Because of the xserver recipe upgrade in the oecore layer, the xserver packaging defined in the .inc file is changed. And this change breaks the packaging of this older xserver recipe.
This commit fixes the issue by using meta-intel layer specific
version of xserver-xorg.inc file

This fixes bug:
[Yocto #3502]

All these warnings are also fixed with this commit:

WARNING: QA Issue: xserver-psb: Files/directories were installed but not shipped
/usr/lib/xorg/modules/extensions/libextmod.so /usr/lib/xorg/modules/extensions/libdbe.so /usr/lib/xorg/modules/extensions/libdri.so /usr/lib/xorg/modules/extensions/libdri2.so /usr/lib/xorg/modules/linux/libfbdevhw.so

Signed-off-by Nitin A Kamble <[email protected]>

---
 .../xorg-xserver/xserver-xorg-1.9.3.inc            |    2 +-
 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |  160 ++++++++++++++++++++
 .../xorg-xserver/xserver-xorg_1.9.3.bb             |    2 +-
 conf/machine/include/meta-intel.inc                |   10 +-
 4 files changed, 171 insertions(+), 3 deletions(-)
 create mode 100644 common/recipes-graphics/xorg-xserver/xserver-xorg.inc

common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc +1 -1

index 1c71d7b..39c9c92 100644
@@ -17,4 +17,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
 SRC_URI[md5sum] = "5bef6839a76d029204ab31aa2fcb5201"
 SRC_URI[sha256sum] = "864831f51e841ff37f2445d1c85b86b559c8860a435fb496aead4f256a2b141d"
 
-PR = "r2"
+PR = "r3"

common/recipes-graphics/xorg-xserver/xserver-xorg.inc new file +160 -0

160 lines not on this page · raw message

common/recipes-graphics/xorg-xserver/xserver-xorg_1.9.3.bb +1 -1

index f62cad2..8e97888 100644
@@ -1,4 +1,4 @@
-require recipes-graphics/xorg-xserver/xserver-xorg.inc
+require xserver-xorg.inc
 require xserver-xorg-${PV}.inc
 
 PE = "1"

conf/machine/include/meta-intel.inc +9 -1

index f0e538d..ed3a423 100644
@@ -7,10 +7,18 @@
 #
 # XSERVER subcomponents, used to build the XSERVER variable
 #
+
+# for Xserver older than 1.13.0
+OLD_XSERVER_IA32_EXT = "xserver-xorg-extension-dri \
+           xserver-xorg-extension-dri2 \
+           xserver-xorg-extension-extmod \
+           xserver-xorg-extension-dbe \
+           "
+
 XSERVER_IA32_EMGD = "emgd-driver-bin \
+           ${OLD_XSERVER_IA32_EXT} \
            "
 
 XSERVER_IA32_MATROX_MGA = "xserver-xorg-module-xaa \
            xf86-video-mga \
            "
-

Signature · 1 line

1.7.3.4

[email protected]

author

2012-11-28 18:37 UTC #2 lore raw

PATCH 2/3 xserver-psb: fix packaging issues

From: Nitin A Kamble <[email protected]>

Because of the xserver recipe upgrade in the oecore layer, the xserver packaging defined in the .inc file is changed. And this change breaks the packaging of this older xserver recipe.
This commit fixes the issue by using the meta-intel
specific version of the xserver-xorg.inc file.

This fixes bug:
[Yocto #3501]

Signed-off-by Nitin A Kamble <[email protected]>

---
 .../xorg-xserver/xserver-psb-1.7.99.2.inc          |    2 +-
 .../xorg-xserver/xserver-psb_1.7.99.2.bb           |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb-1.7.99.2.inc +1 -1

index 1fe962b..3004316 100644
@@ -1,4 +1,4 @@
-PR = "r6"
+PR = "r7"
 
 PROTO_DEPS += "xf86driproto dri2proto"

meta-emenlow/recipes-graphics/xorg-xserver/xserver-psb_1.7.99.2.bb +1 -1

index 6b946d6..4cb5cd2 100644
@@ -1,4 +1,4 @@
-require recipes-graphics/xorg-xserver/xserver-xorg.inc
+require common/recipes-graphics/xorg-xserver/xserver-xorg.inc
 require xserver-psb-${PV}.inc
 
 SRC_URI[md5sum] = "cafc4e2d4ef6cf6e47f3e7dffeb3346a"

Signature · 1 line

1.7.3.4

[email protected]

author

2012-11-28 18:37 UTC #3 lore raw

PATCH 3/3 xserver-xorg-video-psb: fix packaging issues

In reply to [email protected]

From: Nitin A Kamble <[email protected]>

This commit takes care of these packaging warnings.

WARNING: QA Issue: xserver-xorg-video-psb: Files/directories were installed but not shipped
/usr/lib/xorg/modules/drivers/psb_drv.la /usr/lib/xorg/modules/drivers/libmm.la /usr/lib/xorg/modules/drivers/.debug /usr/lib/xorg/modules/drivers/.debug/psb_drv.so /usr/lib/xorg/modules/drivers/.debug/libmm.so

Signed-off-by Nitin A Kamble <[email protected]>

---
 .../xserver-xorg-video-psb_0.32.1.bb               |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

meta-emenlow/recipes-graphics/xserver-xorg-video-psb/xserver-xorg-video-psb_0.32.1.bb +7 -1

index 7972fcd..afbf31b 100644
@@ -1,7 +1,7 @@
 DESCRIPTION = "2D graphics driver for Poulsbo"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://MIT_License.txt;md5=732825ecdcf420261531d935fcd914a7"
-PR = "r3"
+PR = "r4"
 
 inherit autotools

@@ -37,3 +37,9 @@ DEPENDS += "virtual/libgl virtual/xserver"
 RDEPENDS_${PN} = "xserver-psb-module-exa"
 
 COMPATIBLE_MACHINE = "emenlow"
+
+do_install_append() {
+	find ${D}${libdir}/xorg/modules -regex ".*\.la$" | xargs rm -f --
+}
+
+FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug"

Signature · 1 line

1.7.3.4

Tom Zanussi

2012-11-28 20:22 UTC #4 lore raw

In reply to [email protected]

Quoted 5 lines · On Wed, 2012-11-28 at 10:21 -0800, [email protected] wrote:

From: Nitin A Kamble <[email protected]>
This commits are for meta-intel layer. And Ross'es patch tries to achieve the same from the oecore layer.

Hi Nitin,

So does this conflict with Ross's patch, which seems simpler...

Tom

Quoted 27 lines

Thanks,
Nitin
The following changes since commit 154156a4db56f7b33fb1765cf6b87e683d027af9:
emgd-driver-bin: add further needed soft links (2012-11-26 18:02:11 -0600)
are available in the git repository at:
git://git.yoctoproject.org/meta-intel-contrib nitin/misc
http://git.yoctoproject.org/cgit.cgi/meta-intel-contrib/log/?h=nitin/misc
Nitin A Kamble (3):
xserver-xorg-1.9.3: fix packaging issues
xserver-psb: fix packaging issues
xserver-xorg-video-psb: fix packaging issues
 .../xorg-xserver/xserver-xorg-1.9.3.inc            |    2 +-
 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |  160 ++++++++++++++++++++
 .../xorg-xserver/xserver-xorg_1.9.3.bb             |    2 +-
 conf/machine/include/meta-intel.inc                |   10 +-
 .../xorg-xserver/xserver-psb-1.7.99.2.inc          |    2 +-
 .../xorg-xserver/xserver-psb_1.7.99.2.bb           |    2 +-
 .../xserver-xorg-video-psb_0.32.1.bb               |    8 +-
 7 files changed, 180 insertions(+), 6 deletions(-)
 create mode 100644 common/recipes-graphics/xorg-xserver/xserver-xorg.inc

Burton, Ross

2012-11-29 11:42 UTC #5 lore raw

Quoted 1 line · Tom Zanussi

So does this conflict with Ross's patch, which seems simpler...

I do prefer my patch as the same breakage will occur for anyone else using oe-core master but also building their own older X server. Whilst the delta is so minimal, I don't see the problem in supporting both in oe-core.

Ross

Tom Zanussi

2012-11-29 14:35 UTC #6 lore raw

Quoted 8 lines · Ross

Quoted 1 line · Tom Zanussi
So does this conflict with Ross's patch, which seems simpler...
I do prefer my patch as the same breakage will occur for anyone else using oe-core master but also building their own older X server. Whilst the delta is so minimal, I don't see the problem in supporting both in oe-core.

I'll second that...

Tom

Quoted 1 line

Ross

Kamble, Nitin A

author

2012-11-29 17:04 UTC #7 lore raw

Quoted 19 lines

-----Original Message-----
From: Zanussi, Tom
Sent: Thursday, November 29, 2012 6:22 AM
To: Burton, Ross
Cc: Kamble, Nitin A; [email protected]; Openembedded- [email protected]; Hart, Darren
Subject: Re: [meta-intel patch 0/3] Fixes for rescent X breakages in meta- intel layer
Quoted 8 lines · Ross
Quoted 1 line · Tom Zanussi
So does this conflict with Ross's patch, which seems simpler...
I do prefer my patch as the same breakage will occur for anyone else using oe-core master but also building their own older X server. Whilst the delta is so minimal, I don't see the problem in supporting both in oe-core.

Quoted 6 lines

I'll second that...
Tom
Quoted 1 line
Ross

I am fine with either approach for fixing the breakages. I will take Ross's patch and see if it fixes the issue I saw.

Nitin

Kamble, Nitin A

author

2012-12-01 00:25 UTC #8 lore raw

Ross,
I tried applying your patch from here with git am, and it is failing. http://patches.openembedded.org/patch/39801/
Can you send me link to your contrib branch for the patch?

Thanks,
Nitin

Quoted 41 lines

-----Original Message-----
From: Kamble, Nitin A
Sent: Thursday, November 29, 2012 8:50 AM
To: Zanussi, Tom; Burton, Ross
Cc: [email protected]; Openembedded- [email protected]; Hart, Darren
Subject: RE: [meta-intel patch 0/3] Fixes for rescent X breakages in meta- intel layer
Quoted 11 lines
-----Original Message-----
From: Zanussi, Tom
Sent: Thursday, November 29, 2012 6:22 AM
To: Burton, Ross
Cc: Kamble, Nitin A; [email protected]; Openembedded- [email protected]; Hart, Darren
Subject: Re: [meta-intel patch 0/3] Fixes for rescent X breakages in meta- intel layer
Quoted 1 line · Ross
On 28 November 2012 20:07, Tom Zanussi <[email protected]>
Quoted 8 lines · wrote:
Quoted 7 lines
Quoted 1 line
So does this conflict with Ross's patch, which seems simpler...
I do prefer my patch as the same breakage will occur for anyone else using oe-core master but also building their own older X server. Whilst the delta is so minimal, I don't see the problem in supporting both in oe-core.
Quoted 6 lines
I'll second that...
Tom
Quoted 1 line
Ross
I am fine with either approach for fixing the breakages. I will take Ross's patch and see if it fixes the issue I saw.
Nitin

Kamble, Nitin A

author

2012-12-01 02:36 UTC #9 lore raw

In reply to Kamble, Nitin A

I finally got the Ross's patch working in my env. I need to add one more patch in meta-intel to get it fully working.

So I Ack for Ross's patch in oecore, and I will send a small patch for meta-intel.

Thanks,
Nitin

Quoted 59 lines

-----Original Message-----
From: Kamble, Nitin A
Sent: Friday, November 30, 2012 4:09 PM
To: Zanussi, Tom; Burton, Ross
Cc: '[email protected]'; 'Openembedded- [email protected]'; Hart, Darren
Subject: RE: [meta-intel patch 0/3] Fixes for rescent X breakages in meta- intel layer
Ross,
I tried applying your patch from here with git am, and it is failing.
http://patches.openembedded.org/patch/39801/
Can you send me link to your contrib branch for the patch?
Thanks,
Nitin
Quoted 41 lines
-----Original Message-----
From: Kamble, Nitin A
Sent: Thursday, November 29, 2012 8:50 AM
To: Zanussi, Tom; Burton, Ross
Cc: [email protected]; Openembedded- [email protected]; Hart, Darren
Subject: RE: [meta-intel patch 0/3] Fixes for rescent X breakages in meta- intel layer
Quoted 11 lines
-----Original Message-----
From: Zanussi, Tom
Sent: Thursday, November 29, 2012 6:22 AM
To: Burton, Ross
Cc: Kamble, Nitin A; [email protected]; Openembedded- [email protected]; Hart, Darren
Subject: Re: [meta-intel patch 0/3] Fixes for rescent X breakages in meta- intel layer
Quoted 1 line · Ross
On 28 November 2012 20:07, Tom Zanussi <[email protected]>
Quoted 8 lines · wrote:
Quoted 7 lines
Quoted 1 line
So does this conflict with Ross's patch, which seems simpler...
I do prefer my patch as the same breakage will occur for anyone else using oe-core master but also building their own older X server. Whilst the delta is so minimal, I don't see the problem in supporting both in oe-core.
Quoted 6 lines
I'll second that...
Tom
Quoted 1 line
Ross
I am fine with either approach for fixing the breakages. I will take Ross's patch and see if it fixes the issue I saw.
Nitin

Tom Zanussi

2012-12-02 23:25 UTC #10 lore raw

In reply to Tom Zanussi

Quoted 4 lines · Tom Zanussi

Quoted 3 lines · Ross
Quoted 1 line · Tom Zanussi
So does this conflict with Ross's patch, which seems simpler...

Quoted 8 lines

Quoted 5 lines
I do prefer my patch as the same breakage will occur for anyone else using oe-core master but also building their own older X server. Whilst the delta is so minimal, I don't see the problem in supporting both in oe-core.
I'll second that...

Did anyone test this? I'm getting:

1558733.206] (WW) Warning, couldn't open module dri

[1558733.206] (II) UnloadModule: "dri"
[1558733.206] (EE) Failed to load module "dri" (module does not exist,
0)
[1558733.206] (II) LoadModule: "dri2"
[1558733.207] (WW) Warning, couldn't open module dri2
[1558733.207] (II) UnloadModule: "dri2"

Quoted 4 lines

Tom
Quoted 1 line
Ross