summary refs log tree commit diff
path: root/pkgs/os-specific/linux/chromium-os/sommelier/0003-sommelier-don-t-leak-source-absolute-paths.patch
diff options
context:
space:
mode:
authorJamie McClymont <jamie@kwiius.com>2021-04-02 09:04:16 +0000
committerAlyssa Ross <hi@alyssa.is>2021-06-02 12:25:17 +0000
commitd70c553b32b6381843e6bf5277d54541e368c3a1 (patch)
tree094f5b3468466310db09881d645dbad87d971940 /pkgs/os-specific/linux/chromium-os/sommelier/0003-sommelier-don-t-leak-source-absolute-paths.patch
parent64ad908eb80c9b494454f0e4ac06e691a89fdb22 (diff)
downloadnixpkgs-d70c553b32b6381843e6bf5277d54541e368c3a1.tar
nixpkgs-d70c553b32b6381843e6bf5277d54541e368c3a1.tar.gz
nixpkgs-d70c553b32b6381843e6bf5277d54541e368c3a1.tar.bz2
nixpkgs-d70c553b32b6381843e6bf5277d54541e368c3a1.tar.lz
nixpkgs-d70c553b32b6381843e6bf5277d54541e368c3a1.tar.xz
nixpkgs-d70c553b32b6381843e6bf5277d54541e368c3a1.tar.zst
nixpkgs-d70c553b32b6381843e6bf5277d54541e368c3a1.zip
chromiumOSPackages: 83.13020.0.0-rc1 -> 89.13729.0.0-rc1
* chromiumOSPackages.linux: fix config
* chromiumOSPackages.common-mk: update patches
* chromiumOSPackages.vm_protos: drop GN patch
  The missing dependency has been added upstream.
* chromiumOSPackages.common-mk: disable clang-only warnings
* chromiumOSPackages.sommelier: update patches
  Support for stable xdg-shell was implemented in upstream Sommelier,
  but then reverted because the GTK version that comes with the Debian
  in the container Chromium OS uses was too old to support it.
  That's not a problem for us, of course, but it does mean that we can
  use an upstream implementation of xdg-shell.  So here I switch from
  using Puck's implementation, to reverting the revert of the upstream
  one.
* crosvm: fix outdated Cargo.lock from upstream
* crosvm: update VIRTIO_NET_F_MAC patch (renamed to be less annoying)
* crosvm: add new dependencies
* crosvm: patch boot test so it doesn't fail because of no /dev/log.
* crosvm: disable boot test on x86_64 because it often hangs on the AMD
  EPYC 7401P 24-Core Processor I was testing it on (but not my Intel(R)
  Core(TM) i5-2520M CPU @ 2.50GHz).
* spectrumPackages.linux: drop evged patch
  This has reached the Chromium OS kernel now, so we don't need to apply
  it ourselves any more.

Co-authored-by: Alyssa Ross <hi@alyssa.is>
Cc: Puck Meerburg <puck@puckipedia.com>
Reviewed-by: Alyssa Ross <hi@alyssa.is>
Tested-by: Alyssa Ross <hi@alyssa.is>
Message-Id: <20210529144117.571353-2-hi@alyssa.is>
Message-Id: <20210529144117.571353-3-hi@alyssa.is>
Message-Id: <20210529144117.571353-4-hi@alyssa.is>
Message-Id: <20210529144117.571353-5-hi@alyssa.is>
Message-Id: <20210529144117.571353-6-hi@alyssa.is>
Message-Id: <20210529144117.571353-7-hi@alyssa.is>
Message-Id: <20210529144117.571353-8-hi@alyssa.is>
Message-Id: <20210529144117.571353-9-hi@alyssa.is>
Diffstat (limited to 'pkgs/os-specific/linux/chromium-os/sommelier/0003-sommelier-don-t-leak-source-absolute-paths.patch')
-rw-r--r--pkgs/os-specific/linux/chromium-os/sommelier/0003-sommelier-don-t-leak-source-absolute-paths.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/chromium-os/sommelier/0003-sommelier-don-t-leak-source-absolute-paths.patch b/pkgs/os-specific/linux/chromium-os/sommelier/0003-sommelier-don-t-leak-source-absolute-paths.patch
new file mode 100644
index 00000000000..515daf80073
--- /dev/null
+++ b/pkgs/os-specific/linux/chromium-os/sommelier/0003-sommelier-don-t-leak-source-absolute-paths.patch
@@ -0,0 +1,25 @@
+From 98cff9d9c6cd0642ecb54f0fbb799a6a9c666035 Mon Sep 17 00:00:00 2001
+From: Alyssa Ross <hi@alyssa.is>
+Date: Sun, 1 Dec 2019 17:04:04 +0000
+Subject: [PATCH 3/4] sommelier: don't leak source-absolute paths
+
+---
+ vm_tools/sommelier/wayland_protocol.gni | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/vm_tools/sommelier/wayland_protocol.gni b/vm_tools/sommelier/wayland_protocol.gni
+index f894adf81d..28bb5a006b 100644
+--- a/vm_tools/sommelier/wayland_protocol.gni
++++ b/vm_tools/sommelier/wayland_protocol.gni
+@@ -42,7 +42,7 @@ template("wayland_protocol_library") {
+         "wayland-scanner",
+         g.subcommand,
+         "{{source}}",
+-        output_file,
++        rebase_path(output_file),
+       ]
+     }
+   }
+-- 
+2.30.0
+