[PATCH 0/1] glxgears fix

[PATCH 0/1] glxgears fix

[Scott Garman]

Hello,

This pull request fixes a bug where glxgears would fail with the
following error:

Error: couldn't get an RGB, Double-buffered visual.

This was occurring for images which use RPM because do_rootfs could
allow qemugl to be installed after libgl1, and qemugl's postinst needs
to run after libgl1 is installed to replace the libGL library.

This commit changes the postinst to run at first boot instead of during
do_rootfs.

This is an urgent fix to include with 1.2. - [YOCTO #2309]

The following changes since commit dc0fe3fbf9ca862c1d0d90468e6da326f58e3b41:

  qemugl: make postinst run at first boot (2012-04-18 00:21:51 +0100)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib sgarman/glxgears-oe
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=glxgears-oe

Scott Garman (1):
  qemugl: make postinst run at first boot

 meta/recipes-graphics/mesa/qemugl_git.bb |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

-- 
1.7.5.4

[PATCH 1/1] qemugl: make postinst run at first boot

[Scott Garman]

The previous postinst script was not working for images which use
RPM because do_rootfs could allow qemugl to be installed after
libgl1, and the postinst needs to run after libgl1 is installed.

Hence, it's being changed to run at first boot instead of during
do_rootfs.

Signed-off-by: Scott Garman <scott.a.garman@intel.com>
---
 meta/recipes-graphics/mesa/qemugl_git.bb |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-graphics/mesa/qemugl_git.bb b/meta/recipes-graphics/mesa/qemugl_git.bb
index 378aa65..32980d3 100644
--- a/meta/recipes-graphics/mesa/qemugl_git.bb
+++ b/meta/recipes-graphics/mesa/qemugl_git.bb
@@ -19,7 +19,7 @@ S = "${WORKDIR}/git"
 SRCREV = "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
 
 PV = "0.0+git${SRCPV}"
-PR = "r10"
+PR = "r11"
 
 DEFAULT_PREFERENCE = "-1"
 
@@ -34,11 +34,17 @@ do_install () {
     fi
 }
 
+# This cannot be converted to run at pacakge install time, because
+# it depends on being run after the libgl1 package is installed,
+# and RPM cannot guarantee the order of pacakge insallation.
 pkg_postinst_${PN} () {
-    if [ "${PN}" != "qemugl-nativesdk" ]; then
-        rm -f $D${libdir}/libGL.so.1.2
-        ln -s libGL-qemu.so.1.2 $D${libdir}/libGL.so.1.2
-    fi
+#!/bin/sh -e
+if [ x"$D" = "x" ]; then
+	rm -f ${libdir}/libGL.so.1.2
+	ln -s libGL-qemu.so.1.2 ${libdir}/libGL.so.1.2
+else
+	exit 1
+fi
 }
 
 BBCLASSEXTEND = "nativesdk"
-- 
1.7.5.4

Re: [PATCH 1/1] qemugl: make postinst run at first boot

[Henning Heinold]

On Tue, Apr 17, 2012 at 04:33:29PM -0700, Scott Garman wrote:
> The previous postinst script was not working for images which use
> RPM because do_rootfs could allow qemugl to be installed after
> libgl1, and the postinst needs to run after libgl1 is installed.
> 
> Hence, it's being changed to run at first boot instead of during
> do_rootfs.
> 
> Signed-off-by: Scott Garman <scott.a.garman@intel.com>
> ---
>  meta/recipes-graphics/mesa/qemugl_git.bb |   16 +++++++++++-----
>  1 files changed, 11 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/recipes-graphics/mesa/qemugl_git.bb b/meta/recipes-graphics/mesa/qemugl_git.bb
> index 378aa65..32980d3 100644
> --- a/meta/recipes-graphics/mesa/qemugl_git.bb
> +++ b/meta/recipes-graphics/mesa/qemugl_git.bb
> @@ -19,7 +19,7 @@ S = "${WORKDIR}/git"
>  SRCREV = "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
>  
>  PV = "0.0+git${SRCPV}"
> -PR = "r10"
> +PR = "r11"
>  
>  DEFAULT_PREFERENCE = "-1"
^^^^^^^^^^^^^^^^^^^^^^^^^^^

Is this still needed?

Bye Henning

Re: [PATCH 0/1] glxgears fix

[Saul Wold]

On 04/17/2012 04:33 PM, Scott Garman wrote:
> Hello,
>
> This pull request fixes a bug where glxgears would fail with the
> following error:
>
> Error: couldn't get an RGB, Double-buffered visual.
>
> This was occurring for images which use RPM because do_rootfs could
> allow qemugl to be installed after libgl1, and qemugl's postinst needs
> to run after libgl1 is installed to replace the libGL library.
>
> This commit changes the postinst to run at first boot instead of during
> do_rootfs.
>
> This is an urgent fix to include with 1.2. - [YOCTO #2309]
>
> The following changes since commit dc0fe3fbf9ca862c1d0d90468e6da326f58e3b41:
>
>    qemugl: make postinst run at first boot (2012-04-18 00:21:51 +0100)
>
> are available in the git repository at:
>    git://git.pokylinux.org/poky-contrib sgarman/glxgears-oe
>    http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=glxgears-oe
>
> Scott Garman (1):
>    qemugl: make postinst run at first boot
>
>   meta/recipes-graphics/mesa/qemugl_git.bb |   16 +++++++++++-----
>   1 files changed, 11 insertions(+), 5 deletions(-)
>

Merged into OE-Core

Thanks
	Sau!