Patchwork [meta-fsl-arm] gpu-viv-bin-mx6q.inc: Ensure DRI module is add for Wayland + X11 case

login
register
mail settings
Submitter Otavio Salvador
Date July 29, 2013, 4:21 p.m.
Message ID <1375114901-22685-1-git-send-email-otavio@ossystems.com.br>
Download mbox | patch
Permalink /patch/54739/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Otavio Salvador - July 29, 2013, 4:21 p.m.
When Wayland and X11 distro features are enabled, ensure DRI module is
installed. Fixes a regression introduced by 20d7652 (gpu-viv-bin-mx6q:
Adding support to install Wayland GPU libs).

Change-Id: I0b515641edee6a172469f65068f9de837b592c87
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc | 4 ++++
 1 file changed, 4 insertions(+)
Otavio Salvador - July 29, 2013, 4:26 p.m.
On Mon, Jul 29, 2013 at 1:21 PM, Otavio Salvador
<otavio@ossystems.com.br> wrote:
> When Wayland and X11 distro features are enabled, ensure DRI module is
> installed. Fixes a regression introduced by 20d7652 (gpu-viv-bin-mx6q:
> Adding support to install Wayland GPU libs).
>
> Change-Id: I0b515641edee6a172469f65068f9de837b592c87
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

Please guys, give this patch a try. This should fix your rootfs issue.

--
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
John Weber - July 29, 2013, 7:45 p.m.
On 7/29/13 11:26 AM, Otavio Salvador wrote:
> On Mon, Jul 29, 2013 at 1:21 PM, Otavio Salvador
> <otavio@ossystems.com.br> wrote:
>> When Wayland and X11 distro features are enabled, ensure DRI module is
>> installed. Fixes a regression introduced by 20d7652 (gpu-viv-bin-mx6q:
>> Adding support to install Wayland GPU libs).
>>
>> Change-Id: I0b515641edee6a172469f65068f9de837b592c87
>> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>
> Please guys, give this patch a try. This should fix your rootfs issue.

I can confirm that this works to pass the dependency problem with the rootfs 
build for core-image-x11.

Patch

diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
index fbc9eff..f63ed3c 100644
--- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
+++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
@@ -104,6 +104,10 @@  do_install () {
         install -m 0644 ${WORKDIR}/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc
         install -m 0644 ${WORKDIR}/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc
 
+        # Wayland + X11 support
+        if [ "${USE_X11}" = "yes" ]; then
+            cp -r ${S}/usr/lib/dri ${D}${libdir}
+        fi
     elif [ "${USE_X11}" = "yes" ]; then
         cp -r ${S}/usr/lib/dri ${D}${libdir}
         backend=x11