Improve weston image experience
cover Improve weston image experience
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(-)
Signature · 1 line
2.1.4
PATCH 1/2 mesa: Make gl libraries RRECOMMEND mesa-megadriver
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.
--- 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(-)
meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb +3 -0
@@ -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"
meta/recipes-graphics/mesa/mesa.inc +4 -1
@@ -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"
Signature · 1 line
2.1.4
PATCH 2/2 runqemu-internal: Replace wacom-tablet with tablet for usbdevice
From: Khem Raj <[email protected]>
When booting weston-core-image with latest wayland/weston/libinput mouse/touchpad would not work on qemux86, this fixes the issue
--- scripts/runqemu-internal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
scripts/runqemu-internal +2 -2
@@ -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
Signature · 1 line
2.1.4
PATCH v2 1/1 mesa: Make gl libraries RRECOMMEND mesa-megadriver
In reply to Jussi KukkonenThis makes e.g. core-image-weston actually work out-of-the-box on hardware that uses megadriver drivers.
---
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(-)
meta/recipes-graphics/mesa/mesa.inc +3 -1
@@ -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"
Signature · 1 line
2.1.4
Re: [PATCHv2] mesa: Make gl libraries RRECOMMEND mesa-megadriver
Quoted 21 lines · 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 <[email protected]>---
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(-)meta/recipes-graphics/mesa/mesa.inc +0
-0
meta/recipes-graphics/mesa/mesa.inc python __anonymous() { · line 119
Quoted 7 lines
meta/recipes-graphics/mesa/mesa.inc +3
-1@@ -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