[PATCH 0/1] qemu-script: Fix qemu segfault with Nvidia's proprietary driver

[PATCH 0/1] qemu-script: Fix qemu segfault with Nvidia's proprietary driver

[Zhai Edwin]

From: Zhai Edwin <edwin.zhai@intel.com>

Previsous solution is only giving warnings as different distro has different
path of mesa libGL. This patch try to use different path for different distro
after looking at /etc/lsb-release per Raj's suggestion. Ubuntu is there, and
other distro handling can be easily added.

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: gzhai/fix3
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/fix3

Thanks,
    Zhai Edwin <edwin.zhai@intel.com>
---


Zhai Edwin (1):
  qemu-script: Fix qemu seg fault if install Nvidia proprietary driver.

 scripts/poky-qemu-internal |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

[PATCH 1/1] qemu-script: Fix qemu seg fault if install Nvidia proprietary driver.

[Zhai Edwin]

From: Zhai Edwin <edwin.zhai@intel.com>

This fix works on Ubuntu, and other distro can add its own path of Mesa's libGL

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
---
 scripts/poky-qemu-internal |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/scripts/poky-qemu-internal b/scripts/poky-qemu-internal
index c88d711..acaeb1b 100755
--- a/scripts/poky-qemu-internal
+++ b/scripts/poky-qemu-internal
@@ -448,20 +448,29 @@ else
 fi
 
 # qemu got segfault if linked with nVidia's libgl
+GL_LD_PRELOAD=$LD_PRELOAD
+
 if ldd $QEMUBIN | grep -i nvidia &> /dev/null
 then
 cat << EOM
 WARNING: nVidia proprietary OpenGL libraries detected.
 nVidia's OpenGL libraries are known to have compatibility issues with qemu,
 resulting in a segfault. Please uninstall these drivers or ensure the mesa libGL
-libraries precede nvidia's via LD_PRELOAD.
+libraries precede nvidia's via LD_PRELOAD(Already do it on Ubuntu).
 EOM
+
+# Automatically use Ubuntu system's mesa libGL, other distro can add its own path
+    if grep -i ubuntu /etc/lsb-release &> /dev/null
+    then
+        echo "Skip nVidia's libGL on Ubuntu!"
+        GL_LD_PRELOAD="/usr/lib/libGL.so $LD_PRELOAD"
+    fi
 fi
 
 echo "Running $QEMU..."
 # -no-reboot is a mandatory option - see bug #100
 echo $QEMUBIN -kernel $KERNEL $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT --append '"'$KERNCMDLINE $SCRIPT_KERNEL_OPT'"'
-$QEMUBIN -kernel $KERNEL $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT --append "$KERNCMDLINE $SCRIPT_KERNEL_OPT"
+LD_PRELOAD="$GL_LD_PRELOAD" $QEMUBIN -kernel $KERNEL $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT --append "$KERNCMDLINE $SCRIPT_KERNEL_OPT"
 
 
 cleanup
-- 
1.7.1

Re: [PATCH 0/1] qemu-script: Fix qemu segfault with Nvidia's proprietary driver

[Saul Wold]

On 05/06/2011 01:36 AM, Zhai Edwin wrote:
> From: Zhai Edwin<edwin.zhai@intel.com>
>
> Previsous solution is only giving warnings as different distro has different
> path of mesa libGL. This patch try to use different path for different distro
> after looking at /etc/lsb-release per Raj's suggestion. Ubuntu is there, and
> other distro handling can be easily added.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>    Branch: gzhai/fix3
>    Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/fix3
>
> Thanks,
>      Zhai Edwin<edwin.zhai@intel.com>
> ---
>
>
> Zhai Edwin (1):
>    qemu-script: Fix qemu seg fault if install Nvidia proprietary driver.
>
>   scripts/poky-qemu-internal |   13 +++++++++++--

I think that you are using the old script name, I think that you should 
be changing runqemu-internal, not poky-qemu-internal

Please correct this.

Sau!

>   1 files changed, 11 insertions(+), 2 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [PATCH 0/1] qemu-script: Fix qemu segfault with Nvidia's proprietary driver

[Zhai, Edwin]

Saul Wold wrote:
>
> On 05/06/2011 01:36 AM, Zhai Edwin wrote:
> >
> >
> > Pull URL: git://git.pokylinux.org/poky-contrib.git
> >    Branch: gzhai/fix3
> >    Browse: 
> http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/fix3
> >
> > Zhai Edwin (1):
> >    qemu-script: Fix qemu seg fault if install Nvidia proprietary 
> driver.
> >
> >   scripts/poky-qemu-internal |   13 +++++++++++--
>
> I think that you are using the old script name, I think that you should
> be changing runqemu-internal, not poky-qemu-internal
>

Done. Pls. pull @ the same branch
Thanks,
edwin

> Please correct this.
>
> Sau!
>
> >   1 files changed, 11 insertions(+), 2 deletions(-)
> >
> >
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Re: [PATCH 0/1] qemu-script: Fix qemu segfault with Nvidia's proprietary driver

[Saul Wold]

On 05/06/2011 01:36 AM, Zhai Edwin wrote:
> From: Zhai Edwin<edwin.zhai@intel.com>
>
> Previsous solution is only giving warnings as different distro has different
> path of mesa libGL. This patch try to use different path for different distro
> after looking at /etc/lsb-release per Raj's suggestion. Ubuntu is there, and
> other distro handling can be easily added.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>    Branch: gzhai/fix3
>    Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=gzhai/fix3
>
> Thanks,
>      Zhai Edwin<edwin.zhai@intel.com>
> ---
>
>
> Zhai Edwin (1):
>    qemu-script: Fix qemu seg fault if install Nvidia proprietary driver.
>
>   scripts/poky-qemu-internal |   13 +++++++++++--
>   1 files changed, 11 insertions(+), 2 deletions(-)
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Merged in oe-core and poky master

Thanks
	Sau!