On Tue Jun 2, 2020 at 12:56 AM, Alyssa Ross wrote:
crosvm now needs the Minijail sources. However, it'll notice that a Minijail package is provided via pkg-config, and then not actually use those sources or build its own Minijail. It would be nice if the Minijail we provide could be the same version as in Chromium OS, which means bringing Minijail under chromiumOSPackages.
A couple of backports are no longer required; one to common-mk and one to Linux. A new patch to fix a parallel build failure has been introduced. --- This patch is identical to v2 except that it adds a fix for the parallel build issue in vm_protos that Cole found.
...-mk-don-t-leak-source-absolute-paths.patch | 4 +- ...ommon-mk-.gn-don-t-hardcode-env-path.patch | 4 +- ...-Suppress-Wrange-loop-analysis-warni.patch | 72 ----- .../linux/chromium-os/common-mk/default.nix | 1 - .../linux/chromium-os/crosvm/default.nix | 34 ++- .../os-specific/linux/chromium-os/default.nix | 4 +- .../linux/chromium-os/modem-manager/next.nix | 5 +- ...ier-don-t-leak-source-absolute-paths.patch | 4 +- ...melier-use-stable-xdg-shell-protocol.patch | 54 ++-- ...mmelier-make-building-demos-optional.patch | 4 +- ...er-Log-the-value-of-strerror-when-as.patch | 245 ------------------ .../linux/chromium-os/sommelier/default.nix | 1 - pkgs/os-specific/linux/chromium-os/update.py | 1 + .../linux/chromium-os/upstream-info.json | 42 +-- ...03-vm_tools-proto-fix-parallel-build.patch | 39 +++ .../linux/chromium-os/vm_protos/default.nix | 2 + ...virtwl-Support-multiple-host-sockets.patch | 126 --------- pkgs/os-specific/linux/kernel/patches.nix | 5 - 18 files changed, 121 insertions(+), 526 deletions(-)
Works for me now! I ran $ nix-shell -p spectrumPackages.spectrum-vm --run spectrum-vm and Wayfire appeared. I spun around some workspaces, figured out the `d` key so I could C-d and close the terminal window, and played around for a couple minutes. Then, I ended it by hitting enter and typed `reboot` (not `poweroff`, which will hang for an amount of time I was too impatient to wait for) in the serial console in the terminal I ran the above command with. (This little play-by-play intended as a sort of "intro to spectrum-vm" before I actually write one up. Note that the default keymap is Dvorak -- to change it, you'll need to change the xkb_variant in Wayfire's config located inside pkgs/os-specific/linux/spectrum/rootfs/default.nix). Reviewed-by: Cole Helbling <cole.e.helbling@outlook.com> Tested-by: Cole Helbling <cole.e.helbling@outlook.com>