summary refs log tree commit diff
path: root/pkgs/os-specific/linux/chromium-os/sommelier/0005-sommelier-use-stable-xdg-shell-protocol.patch
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2020-05-14 13:07:42 +0000
committerAlyssa Ross <hi@alyssa.is>2020-05-14 13:07:42 +0000
commitc5c894f4f357344c411b8419b14ee9cb61e020fa (patch)
treefa1aedc875cecdf4e9ca0de2c264c1f4d96cab64 /pkgs/os-specific/linux/chromium-os/sommelier/0005-sommelier-use-stable-xdg-shell-protocol.patch
parent83116eba4cae0941297950ccec9c6bac908fc7f4 (diff)
downloadnixpkgs-c5c894f4f357344c411b8419b14ee9cb61e020fa.tar
nixpkgs-c5c894f4f357344c411b8419b14ee9cb61e020fa.tar.gz
nixpkgs-c5c894f4f357344c411b8419b14ee9cb61e020fa.tar.bz2
nixpkgs-c5c894f4f357344c411b8419b14ee9cb61e020fa.tar.lz
nixpkgs-c5c894f4f357344c411b8419b14ee9cb61e020fa.tar.xz
nixpkgs-c5c894f4f357344c411b8419b14ee9cb61e020fa.tar.zst
nixpkgs-c5c894f4f357344c411b8419b14ee9cb61e020fa.zip
chromiumOSPackages.sommelier: fix log spam
Previously, sommelier would output many lines per second saying:

> Failed to send message to virtwl: Success

This made it extremely annoying to use the serial console, and
very difficult to see other log output.

This was happening because Sommelier's check for the return value of
the VIRTWL_IOCTL_SEND ioctl was inverted from what it should be.
That is, the failure message was printed only on success.  If there
actually was an error, no error message would be outputted.

The upstream patch I've added here is a bit vague that this was the
problem, but it does fix the issue.
Diffstat (limited to 'pkgs/os-specific/linux/chromium-os/sommelier/0005-sommelier-use-stable-xdg-shell-protocol.patch')
-rw-r--r--pkgs/os-specific/linux/chromium-os/sommelier/0005-sommelier-use-stable-xdg-shell-protocol.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/chromium-os/sommelier/0005-sommelier-use-stable-xdg-shell-protocol.patch b/pkgs/os-specific/linux/chromium-os/sommelier/0005-sommelier-use-stable-xdg-shell-protocol.patch
index 20994bc1785..5a6e57375a3 100644
--- a/pkgs/os-specific/linux/chromium-os/sommelier/0005-sommelier-use-stable-xdg-shell-protocol.patch
+++ b/pkgs/os-specific/linux/chromium-os/sommelier/0005-sommelier-use-stable-xdg-shell-protocol.patch
@@ -1,7 +1,7 @@
 From 5068e64b2fdedca0a4a9f1894335af8587c4c55a Mon Sep 17 00:00:00 2001
 From: Puck Meerburg <puck@puckipedia.com>
 Date: Tue, 3 Dec 2019 18:06:14 +0000
-Subject: [PATCH 5/6] sommelier: use stable xdg-shell protocol
+Subject: [PATCH 5/7] sommelier: use stable xdg-shell protocol
 
 From https://github.com/wayland-project/weston/commit/d8d9f5e6e16c8f6a3c06763d5f56c27dc9a6e52e:
 
@@ -1744,5 +1744,5 @@ index b851b5c8d..7e6daf773 100644
  struct sl_global* sl_gtk_shell_global_create(struct sl_context* ctx);
  
 -- 
-2.25.1
+2.26.2