[PATCH 0/2] Improve weston image experience

[PATCH 0/2] Improve weston image experience

[Jussi Kukkonen]

Currently core-image-weston doesn't work nicely out-of-the-box
on hardware or on qemu. Sending a couple of small changes for that.

The runqemu-internal patch was sent by Khem a few months back but
never made it to jethro. I believe it is correct: "-usbdevice tablet"
is what the qemu documentation suggests as well.

Thanks,
 Jussi

The following changes since commit d9aabf9639510fdb3e2ccc21ba5ae4aa9f6e4a57:

  gcc: Drop 4.8 (2015-11-16 14:59:18 +0000)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib jku/weston
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/weston

Jussi Kukkonen (1):
  mesa: Make gl libraries RRECOMMEND mesa-megadriver

Khem Raj (1):
  runqemu-internal: Replace wacom-tablet with tablet for usbdevice

 meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb | 3 +++
 meta/recipes-graphics/mesa/mesa.inc          | 5 ++++-
 scripts/runqemu-internal                     | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

-- 
2.1.4

[PATCH 1/2] mesa: Make gl libraries RRECOMMEND mesa-megadriver

[Jussi Kukkonen]

This makes e.g. core-image-weston actually work out-of-the-box
on hardware that uses megadriver drivers.

With typical mesa-gl use this would be unexpected: skip the
recommendation there.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb | 3 +++
 meta/recipes-graphics/mesa/mesa.inc          | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb b/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb
index fc2bca9..d55f56e 100644
--- a/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb
+++ b/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb
@@ -11,3 +11,6 @@ S = "${WORKDIR}/mesa-${PV}"
 PACKAGECONFIG ??= "dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
 
 EXCLUDE_FROM_WORLD = "1"
+
+# GL libraries should not RRECOMMEND megadriver
+SKIP_RRECOMMENDS_MEGADRIVER = "1"
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 13a8b9d..3400b1c 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -114,7 +114,10 @@ python __anonymous() {
         d.appendVar("RREPLACES_" + fullp, pkgs)
         d.appendVar("RPROVIDES_" + fullp, pkgs)
         d.appendVar("RCONFLICTS_" + fullp, pkgs)
-        
+
+        if d.getVar("SKIP_RRECOMMENDS_MEGADRIVER", False) != "1":
+            d.appendVar("RRECOMMENDS_" + fullp, "mesa-megadriver")
+
         # For -dev, the first element is both the Debian and original name
         fullp += "-dev"
         pkgs = p[1] + "-dev"
-- 
2.1.4

[PATCH 2/2] runqemu-internal: Replace wacom-tablet with tablet for usbdevice

[Jussi Kukkonen]

From: Khem Raj <raj.khem@gmail.com>

When booting weston-core-image with latest wayland/weston/libinput
mouse/touchpad would not work on qemux86, this fixes the issue

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---
 scripts/runqemu-internal | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index 3b0e54c..c2787c3 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -119,7 +119,7 @@ ORIG_STTY=$(stty -g)
 if [ "$SLIRP_ENABLED" = "yes" ]; then
     KERNEL_NETWORK_CMD="ip=dhcp"
     QEMU_TAP_CMD=""
-    QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice wacom-tablet"
+    QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice tablet"
     QEMU_NETWORK_CMD=""
     DROOT="/dev/vda"
     ROOTFS_OPTIONS="-drive file=$ROOTFS,if=virtio,format=raw"
@@ -268,7 +268,7 @@ else
         ROOTFS_OPTIONS="-drive file=$ROOTFS,if=virtio,format=raw"
 
         KERNCMDLINE="mem=$QEMU_MEMORY"
-        QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice wacom-tablet"
+        QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice tablet"
 
         NFS_INSTANCE=`echo $TAP | sed 's/tap//'`
         export NFS_INSTANCE
-- 
2.1.4

[PATCHv2] mesa: Make gl libraries RRECOMMEND mesa-megadriver

[Jussi Kukkonen]

This makes e.g. core-image-weston actually work out-of-the-box
on hardware that uses megadriver drivers.

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
---

Ross pointed out that the part about mesa-gl was not actually true,
especially with regards to swrast: e.g. RPi still probably want it.
So I've removed the conditional bit: all mesa gl libraries now
RRECOMMEND megadriver.

This is force pushed to branch 'jku/weston'.

 meta/recipes-graphics/mesa/mesa.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 13a8b9d..424e8b7 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -114,7 +114,9 @@ python __anonymous() {
         d.appendVar("RREPLACES_" + fullp, pkgs)
         d.appendVar("RPROVIDES_" + fullp, pkgs)
         d.appendVar("RCONFLICTS_" + fullp, pkgs)
-        
+
+        d.appendVar("RRECOMMENDS_" + fullp, "mesa-megadriver")
+
         # For -dev, the first element is both the Debian and original name
         fullp += "-dev"
         pkgs = p[1] + "-dev"
-- 
2.1.4

Re: [PATCHv2] mesa: Make gl libraries RRECOMMEND mesa-megadriver

[Andreas Müller]

On Wed, Nov 18, 2015 at 4:00 PM, Jussi Kukkonen
<jussi.kukkonen@intel.com> wrote:
> This makes e.g. core-image-weston actually work out-of-the-box
> on hardware that uses megadriver drivers.
>
> Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
> ---
>
> Ross pointed out that the part about mesa-gl was not actually true,
> especially with regards to swrast: e.g. RPi still probably want it.
> So I've removed the conditional bit: all mesa gl libraries now
> RRECOMMEND megadriver.
>
> This is force pushed to branch 'jku/weston'.
>
>  meta/recipes-graphics/mesa/mesa.inc | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
> index 13a8b9d..424e8b7 100644
> --- a/meta/recipes-graphics/mesa/mesa.inc
> +++ b/meta/recipes-graphics/mesa/mesa.inc
> @@ -114,7 +114,9 @@ python __anonymous() {
>          d.appendVar("RREPLACES_" + fullp, pkgs)
>          d.appendVar("RPROVIDES_" + fullp, pkgs)
>          d.appendVar("RCONFLICTS_" + fullp, pkgs)
> -
> +
> +        d.appendVar("RRECOMMENDS_" + fullp, "mesa-megadriver")
> +
I leading space is required " mesa-megadriver" - otherwise this fails
if RRECOMMENDS is not empty.

Andreas