June 2020 - Spectrum Development

[PATCH crosvm 0/2] Fix deadlock on early VmRequest
by Alyssa Ross 09 Jul '20

09 Jul '20

This is the problem you might have seen me complaining about on IRC a couple of days ago. A detailed explanation of the issue and the fix can be found in the second patch message. The fix consists of two patches. The first just adds an API that's needed by the refactored, fixed code. The actual bug fix is in the second patch. Alyssa Ross (2): msg_socket: introduce UnixSeqpacketExt crosvm: fix deadlock on early VmRequest devices/src/virtio/block.rs | 5 + msg_socket/src/lib.rs | 52 ++++++---- src/linux.rs | 201 ++++++++++++++++++++++++++++++------ vm_control/src/lib.rs | 57 +++++++--- 4 files changed, 245 insertions(+), 70 deletions(-) -- 2.26.2

3 10

This (Last) Week in Spectrum, 2020-W26
by Alyssa Ross 29 Jun '20

29 Jun '20

This is going to be a very short one, and it's coming a day late, because I have been busy and didn't want to stop yesterday. 2020-W22's TWiS was sent a day early, so the delay is balanced out. :) Wayland ------- I'm finally making progress with the Wayland stuff I've been staring at for the past two weeks! Now that I'm unblocked, things feel like they're moving very quickly. I've modified a Wayland compositor and libwayland-server to use a virtio_wl socket. I've also implemented the compositor side of the accept(2) fallback. Just now, I finished writing a proxy program that implements the host side of that. Next up is testing it. After that, I think we might be there? But it's also possible I have my head so deep in it there's another bit that I've forgotten.

1 0

This Week in Spectrum, 2020-W25
by Alyssa Ross 21 Jun '20

21 Jun '20

Another week that ended up being a detour from the Wayland work I wanted to do, unfortunately. I think this will be the end of it, though. crosvm ------ Fixed[1] an error in my crosvm deadlock fix[2] from last week. Due to an oversight (obvious as soon as I tried to test the affected devices, and from looking at the code in retrospect), this actually broke the devices that were *not* affected by the deadlock, which I had neglected to properly test. Fortunately, it was a very small and easy fix. I also had an interesting (and ongoing) conversation[3] with Cole about the deadlock fix in the mailing list thread. It's one of those situations where getting to talk about the code with another person and having to explain things is going to result in much better code. So we'll end up with a much tidier fix than what I came up with on my own. Thanks to Cole for his feedback and this opportunity. It's great to know that somebody else is passing an eye over my code. [1]: https://spectrum-os.org/git/crosvm/commit/?id=ca5bdd2ac3e473e9b082c44c2870f… [2]: https://spectrum-os.org/lists/archives/spectrum-devel/20200614114344.22642-… [3]: https://spectrum-os.org/lists/archives/spectrum-devel/CH2PR14MB357902F38908… Wayland ------- My current area of attention is modifying Wayland to use a virtio_wl socket as the display socket. Preparing to start implementing that this week, it occurred to me that working on it using my current setup was going to be extremely time consuming. Up until now, I've been doing Nix VM rebuilds when I want to test a change to, for example, wlroots. This means rebuilding, in that case, wlroots and all dependencies (i.e. Wayfire). In the case of wlroots, it's not so bad because rebuilding two packages doesn't take all that long, but it wasn't going to work for Wayland. So I decided that the best way forward would be to create a VM running a traditional Linux distribution, in which I could hack on Wayland without having to restart the VM or rebuild all of its dependents. To that end, I spent much of this week setting up an Alpine VM that can be run under both crosvm and QEMU. (Configuring networking with crosvm is hard for a one-off like this, but QEMU has a built-in userspace networking stack[4] that makes it easy, so when I want to, e.g. install a package, I can boot with QEMU to do that, and then go back to crosvm for testing virtio_wl things.) This resulted in a Nixpkgs pull request[5] to package Alpine's apk package manager, which was used in building the VM image. As of this afternoon, I have this VM all set up and ready to go. I have a script that runs it under crosvm with a virtio_wl socket available to try to connect Wayland to, and another virtio_wl socket connected to the host Wayland compositor for testing. It also sets up some limited networking that allows me to SSH into the VM, but does not allow the VM to access the internet. A separate script runs the VM under QEMU with full networking. The VM has Wayland, wlroots, and Sway (the choice of wlroots-based compositor is irrelevant to this work, and Sway is easier to build) installed from source, and because I can SSH to it I can edit files in the VM easily from my host Emacs using TRAMP[6]. All of this will allow me to iterate on the Wayland work without having to wait upwards of an hour to test each change. This was actually the first time I'd ever booted a VM image in crosvm that I hadn't generated specifically for that purpose myself with Nix. I improved my understanding of crosvm in a few ways in the process (although not anything concrete enough I can think of to write down here). [4]: https://wiki.qemu.org/Documentation/Networking#User_Networking_.28SLIRP.29 [5]: https://github.com/NixOS/nixpkgs/pull/90676 [6]: https://www.gnu.org/software/tramp/ Next week, I'll continue with the Wayland work. It shouldn't be all that much work in the end, but getting set up to actually be able to do it has been annoyingly complicated.

1 0

This Week in Spectrum, 2020-W24
by Alyssa Ross 14 Jun '20

14 Jun '20

An interesting week. Didn't go quite in the direction I expected it to. Documentation ------------- Cole kindly provided[1] some documentation[2] for spectrum-vm for the developer manual. This was especially nice, because it marked the first time I was able to remove[3] an item from the Contribution Ideas page[4] because somebody had done the contribution! Thanks Cole! [1]: https://spectrum-os.org/lists/archives/spectrum-devel/87zh97coks.fsf@alyssa… [2]: https://spectrum-os.org/doc/developer-manual.html#_spectrum_vm [3]: https://spectrum-os.org/git/www/commit/?id=bf7cde0ddd06455f212fb39092b87313… [4]: https://spectrum-os.org/todo.html crosvm ------ My main goal for this week was to start modifying libwayland-server to use a virtio_wl socket as the display socket, as described last week[5]. So, in pursuit of this goal, I started the week by trying to write a test program that would start a VM running a compositor, create a socket, attach one end to that VM, and then start another VM running a Wayland client, and attach the other end of the socket to that VM. Then, in theory, all I had to do was the libwayland-server modifications, and then the compositor and client would be able to talk to each other. Unfortunately, I didn't get that far. The program froze after starting the first VM. I assumed I must have done something wrong, so I rewrote it, and had the same problem. I did it again, and same problem. Some further debugging revealed that the command to add the socket to the first VM was hanging. And also, crosvm was hanging. Running the command outside this program worked fine, though. It returned immediately, and crosvm kept running with the new socket added. What I eventually realised was that the crosvm hang only happened if the command was sent to it early enough. After some intense staring at the crosvm code, I realised that there was a deadlock resulting from trying to wait for a response from a virtual device before the device had been initialized. Despite this issue manifesting with adding Wayland sockets, which is a feature unique to crosvm, a lot of the code for that is adapted from the code for resizing virtual block devices, which is an upstream feature. And that had the same issue, so this is actually an upstream bug. The fix was not easy, and required some fairly substantial refactoring. It's described in detail in the patch message[6]. I think it's probably a pretty interesting read. I also merged in the latest upstream crosvm changes. [5]: https://spectrum-os.org/lists/archives/spectrum-discuss/87tuzm287b.fsf@alys… [6]: https://spectrum-os.org/lists/archives/spectrum-devel/20200614114344.22642-… Nixpkgs ------- I spent a few more hours trying to get libvda (an optional dependency of crosvm; required for virtio-video) to build, and I got it to work, thanks to some help from Puck. There's still a hack in there I'll tidy up before I push it, but it's cool to have this packaged for future experimentation with this crosvm feature. With the crosvm issue out of the way, which ended up taking most of the week to identify and fix, hopefully next week I'll be able to actually get going on those libwayland-server changes.

1 0

[PATCH doc v2] Document spectrum-vm
by Cole Helbling 13 Jun '20

13 Jun '20

spectrum-vm is a handy way to start a crosvm instance for testing crosvm itself, the kernel, or the rootfs. This commit adds some fledgling documentation on its functionality and usage. --- Takes into account review suggestions and tweaks a bit of wording here and there. Specifically, I clarified that rootfs means the root filesystem, added an aside that the serial console can be used to run privileged commands, dropped the full `spectrum-vm --help` text, and moved and reformatted the usage examples. developer-manual.adoc | 53 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/developer-manual.adoc b/developer-manual.adoc index b7eb2cb..a98330f 100644 --- a/developer-manual.adoc +++ b/developer-manual.adoc @@ -106,6 +106,59 @@ the https://spectrum-os.org/doc/crosvm/crosvm/[crosvm documentation] for the version currently used by Spectrum is hosted on the Spectrum website. +==== spectrum-vm + +`spectrum-vm` is a shell script that allows for testing various Spectrum +VM components, including crosvm, the kernel, and the root filesystem +("rootfs" for short). The simplest way to use this tool is by running +`nix-shell -I nixpkgs=/path/to/nixpkgs-spectrum -p +spectrumPackages.spectrum-vm --run spectrum-vm` in a terminal, which +will start up an instance of crosvm from Nixpkgs running Wayfire in a +new window. + +**** +Be advised that Wayfire's default keymap is set to Dvorak +https://spectrum-os.org/git/nixpkgs/tree/pkgs/os-specific/linux/spectrum/rootfs/default.nix[inside +of the rootfs] -- to change this to your preferred keymap, just set the +`xkb_layout` option (or remove it altogether for a default of QWERTY). +**** + +Once you are ready to end your crosvm session, switch back to where you +ran `spectrum-vm` and type `reboot` (not `poweroff`). This window is not +limited to just stopping the VM, however; it is a functional serial +console where you can even run commands like `env` and `cat +/etc/passwd`. + +**** +Although it is currently not possible to execute commands as root inside +the graphical environment, one can instead use the serial console to run +privileged commands. +**** + +===== Examples + +As mentioned above, `spectrum-vm` also supports options that allow you +to specify custom components or run arbitrary commands before exiting: + +---- +nix-shell -I nixpkgs=/path/to/nixpkgs-spectrum -p spectrumPackages.spectrum-vm + +# display the currently supported options for spectrum-vm +nix-shell$ spectrum-vm --help + +# run a command that will print out the VM's PATH to the serial terminal and exit +nix-shell$ spectrum-vm -c 'echo $PATH' + +# use the specified crosvm and disable sandboxing +nix-shell$ spectrum-vm -C target/debug/crosvm -- --disable-sandbox + +# use the specified kernel image +nix-shell$ spectrum-vm -k result/bzImage + +# use the specified squashfs as the root filesystem image +nix-shell$ spectrum-vm -f squashfs +---- + ==== Hacking on crosvm There are a few ways to get a crosvm development environment. You can -- 2.26.2

2 1

[PATCH doc] Document spectrum-vm
by Cole Helbling 10 Jun '20

10 Jun '20

spectrum-vm is a handy way to start a crosvm instance for testing crosvm itself, the kernel, or the rootfs. This commit adds some fledgling documentation on its functionality and usage. --- I feel like this is mostly a rough draft, so give me all your suggestions/criticisms/what have you. I put this section above the "Hacking on crosvm" section so that it will be introduced before it is used in an example. developer-manual.adoc | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/developer-manual.adoc b/developer-manual.adoc index b7eb2cb..739dc83 100644 --- a/developer-manual.adoc +++ b/developer-manual.adoc @@ -106,6 +106,49 @@ the https://spectrum-os.org/doc/crosvm/crosvm/[crosvm documentation] for the version currently used by Spectrum is hosted on the Spectrum website. +==== spectrum-vm + +`spectrum-vm` is a shell script that allows for testing various Spectrum +VM components, including crosvm, the kernel, and the rootfs. The +simplest way to use this tool is by running `nix-shell -I +nixpkgs=/path/to/nixpkgs-spectrum -p spectrumPackages.spectrum-vm --run +spectrum-vm` in a terminal, which will start up an instance of crosvm +from Nixpkgs running Wayfire in a new window. + +**** +Be advised that Wayfire's default keymap is set to Dvorak +https://spectrum-os.org/git/nixpkgs/tree/pkgs/os-specific/linux/spectrum/rootfs/default.nix[inside +of the rootfs] -- to change this to your preferred keymap, just set the +`xkb_layout` option (or remove it altogether for a default of QWERTY). +**** + +Once you are ready to end your crosvm session, switch back to where you +ran `spectrum-vm` and type `reboot` (not `poweroff`). This window is not +limited to just stopping the VM, however; it is a functional serial +console and you can even run commands like `env` and `cat +/etc/passwd`. + +As mentioned above, `spectrum-vm` also supports options that allow you +to specify custom components or run arbitrary commands before exiting: + +---- +nix-shell -I nixpkgs=/path/to/nixpkgs-spectrum -p spectrumPackages.spectrum-vm + +nix-shell$ spectrum-vm --help +Usage: spectrum-vm [OPTION]... [-- CROSVM_OPTIONS] + + -c COMMAND shell command to run inside VM + -C, --crosvm PATH path to custom crosvm executable + -k, --kernel PATH path to custom kernel image + -f, --rootfs PATH path to custom root file system image + -- CROSVM_OPTIONS extra arguments to pass to crosvm + +nix-shell$ spectrum-vm -c 'echo $PATH' # print out the VM's PATH to the serial terminal and exit +nix-shell$ spectrum-vm -C target/debug/crosvm -- --disable-sandbox # use the specified crosvm and disable sandboxing +nix-shell$ spectrum-vm -k result/bzImage # use the specified kernel image +nix-shell$ spectrum-vm -f squashfs # use the specified squashfs as the root filesystem image +---- + ==== Hacking on crosvm There are a few ways to get a crosvm development environment. You can -- 2.26.2

2 1

This Week in Spectrum, 2020-W23
by Alyssa Ross 07 Jun '20

07 Jun '20

I wasn't quite back up to normal speed after being sick last week, I think, but we're getting somewhere and I did some cool stuff! Infrastructure -------------- Upgraded Mailman. Most significantly, the Hyperkitty UI has some nice improvements, which I think will make it easier to navigate. :) Nixpkgs ------- I integrated and committed last week's wlroots patch (to make it use virtio_wl-compatible memfds). Spent quite a lot the start of the week working on packaging more Chromium OS components to build some optional crosvm features. They just added support for virtio-video[1], which sounds pretty cool. I managed to get libchrome working again, which I previously had to remove because I couldn't get it to build! I haven't committed any of this yet, because I haven't got to the point where it's useful for building optional crosvm features, and I don't want to add packages that aren't useful for anything, but I did make quite a lot of progress. After a couple of days of this, though, I put it aside to focus on other things, since it would be useful to have, but its not a priority right now. [1]: https://chromium.googlesource.com/chromiumos/platform/crosvm/+/57df6a0ab23c… crosvm ------ I posted a patch[2] to make listing a directory shared with --shared-dir not crash crosvm when sandboxing was enabled. I'd been reluctant to fix this, because --shared-dir (which exposes a host file system to a crosvm guest) is not going to be useful in Spectrum, where shared directories should come from another VM. But it's useful enough in development that not fixing it was more frustrating than just fixing it. I spent a lot of time this week thinking about Wayland connections. My original plan for inter-VM communication was to make it possible to run crosvm devices as standalone programs inside VMs. I still think this is the right track for most virtio devices, but for Wayland it's starting to feel less and less like it makes sense, because the Wayland device is basically a wrapper around a socket, and both ends will be hooked up to sockets. So what I now plan is that a VM running a Wayland client application will connect to a host socket, with the other end connected to a VM running the compositor. The client applications will be run under Sommelier, and so will be able to run unmodified. The compositor will be modified to use a virtio_wl socket. A slight complication here is that a Wayland compositor usually accepts on a socket to receive client connections, but you can't accept on a virtio_wl context. So instead, what we can do is emulate accept by attaching a new virtio_wl socket, and then sending the name of that socket over the main socket. This can be wrapped inside the VM to look very much like an accept. Unfortunately, crosvm virtio_wl sockets could only be set at startup time. So today I fixed that[3]. Adding support for adding virtio_wl sockets at runtime was pleasantly straightforward. I feel very energized now that I managed to bang that out in a day. :D [2]: https://spectrum-os.org/lists/archives/spectrum-devel/20200605234757.28848-… [3]: https://spectrum-os.org/git/crosvm/commit/?h=interguest This is one of those weeks where I can feel writing this that it might not make much sense to anybody else. But the important thing with these weekly updates is that I write _something_ we can refer back to in future, and communicate that things are happening. If you'd like to better understand what I'm talking about here, I'm happy to try walking through it on IRC. Next week, I'm going to work on getting libwayland-server to speak this weird virtio_wl faux-accept.

1 0

[PATCH crosvm] seccomp: allow getdents64 if getdents is allowed
by Alyssa Ross 05 Jun '20

05 Jun '20

This fixes a crash where crosvm would crash if run on x86_64 with --shared-dir when running ls in the shared directory. I suspect whether getdents or getdents64 is used depends on the host libc, so allow both of them. I suspect upstream's libc uses getdents, and that's why they haven't fixed the problem. --- This finally annoyed me enough that I decided to fix it. Michael, I think you'd also run into this issue. Want to test the fix? seccomp/x86_64/9p_device.policy | 1 + seccomp/x86_64/gpu_device.policy | 1 + seccomp/x86_64/xhci.policy | 1 + 3 files changed, 3 insertions(+) diff --git a/seccomp/x86_64/9p_device.policy b/seccomp/x86_64/9p_device.policy index 114ea11..271d244 100644 --- a/seccomp/x86_64/9p_device.policy +++ b/seccomp/x86_64/9p_device.policy @@ -18,6 +18,7 @@ unlink: 1 rename: 1 pread64: 1 getdents: 1 +getdents64: 1 mkdir: 1 rmdir: 1 fsync: 1 diff --git a/seccomp/x86_64/gpu_device.policy b/seccomp/x86_64/gpu_device.policy index 331fc49..99d2a8d 100644 --- a/seccomp/x86_64/gpu_device.policy +++ b/seccomp/x86_64/gpu_device.policy @@ -52,6 +52,7 @@ fstat: 1 # Used to set of size new memfd. ftruncate: 1 getdents: 1 +getdents64: 1 geteuid: 1 getrandom: 1 getuid: 1 diff --git a/seccomp/x86_64/xhci.policy b/seccomp/x86_64/xhci.policy index 4b4fc3d..3448ce2 100644 --- a/seccomp/x86_64/xhci.policy +++ b/seccomp/x86_64/xhci.policy @@ -38,4 +38,5 @@ ioctl: arg1 == 0xc0185500 || arg1 == 0x41045508 || arg1 == 0x8004550f || arg1 == fstat: 1 getrandom: 1 getdents: 1 +getdents64: 1 lseek: 1 -- 2.26.2

1 0

[PATCH 1/2] chromiumOSPackages: improve update.py repo compat
by Alyssa Ross 02 Jun '20

02 Jun '20

These changes make chromiumOSPackages.updateScript better understand the Repo manifest format[1]. It now properly distinguishes between paths in the Chromium OS source tree and paths on the git servers, which are usually not the same. For example, chromiumos-overlay is located in the source tree at src/third_party/chromiumos-overlay, but on chromium.googlesource.com it's located at chromiumos/overlays/chromiumos-overlays. Components are now keyed by their location in the Chromium OS source tree (and packages have all been updated for this change.) Additionally, it now understands Repo remotes. This means that it is now possible to use a Chromium OS component like Minijail, which is hosted on android.googlesource.com rather than chromiumos.googlesource.com. This was not previously possible. [1]: https://gerrit.googlesource.com/git-repo/+/HEAD/docs/manifest-format.md --- .../linux/chromium-os/common-mk/default.nix | 2 +- .../linux/chromium-os/crosvm/default.nix | 4 +- .../os-specific/linux/chromium-os/default.nix | 2 +- .../linux/chromium-os/libqmi/default.nix | 2 +- .../linux/chromium-os/minigbm/default.nix | 2 +- .../linux/chromium-os/modem-manager/next.nix | 2 +- .../linux/chromium-os/modp_b64/default.nix | 2 +- pkgs/os-specific/linux/chromium-os/update.py | 56 ++++++++++++------- .../linux/chromium-os/upstream-info.json | 40 ++++++------- pkgs/os-specific/linux/kernel/linux-cros.nix | 2 +- 10 files changed, 64 insertions(+), 50 deletions(-) diff --git a/pkgs/os-specific/linux/chromium-os/common-mk/default.nix b/pkgs/os-specific/linux/chromium-os/common-mk/default.nix index f07e418b56f..73862bcaa97 100644 --- a/pkgs/os-specific/linux/chromium-os/common-mk/default.nix +++ b/pkgs/os-specific/linux/chromium-os/common-mk/default.nix @@ -24,7 +24,7 @@ , ... } @ args: let - platform2 = fetchFromGitiles upstreamInfo.components."chromiumos/platform2"; + platform2 = fetchFromGitiles upstreamInfo.components."src/platform2"; attrsToGnList = lib.mapAttrsToList (name: value: "${name}=${toGn value}"); diff --git a/pkgs/os-specific/linux/chromium-os/crosvm/default.nix b/pkgs/os-specific/linux/chromium-os/crosvm/default.nix index 3813e3eb75a..8698ef67a83 100644 --- a/pkgs/os-specific/linux/chromium-os/crosvm/default.nix +++ b/pkgs/os-specific/linux/chromium-os/crosvm/default.nix @@ -9,10 +9,10 @@ let else throw "no seccomp policy files available for host platform"; crosvmSrc = fetchFromGitiles - upstreamInfo.components."chromiumos/platform/crosvm"; + upstreamInfo.components."src/platform/crosvm"; adhdSrc = fetchFromGitiles - upstreamInfo.components."chromiumos/third_party/adhd"; + upstreamInfo.components."src/third_party/adhd"; in rustPlatform.buildRustPackage rec { diff --git a/pkgs/os-specific/linux/chromium-os/default.nix b/pkgs/os-specific/linux/chromium-os/default.nix index f9c6c88d072..db719e8b0f1 100644 --- a/pkgs/os-specific/linux/chromium-os/default.nix +++ b/pkgs/os-specific/linux/chromium-os/default.nix @@ -9,7 +9,7 @@ let upstreamInfo = lib.importJSON ./upstream-info.json; chromiumos-overlay = (fetchFromGitiles - upstreamInfo.components."chromiumos/overlays/chromiumos-overlay") // { + upstreamInfo.components."src/third_party/chromiumos-overlay") // { passthru.updateScript = ./update.py; }; diff --git a/pkgs/os-specific/linux/chromium-os/libqmi/default.nix b/pkgs/os-specific/linux/chromium-os/libqmi/default.nix index ac444848b81..ec4f44c7047 100644 --- a/pkgs/os-specific/linux/chromium-os/libqmi/default.nix +++ b/pkgs/os-specific/linux/chromium-os/libqmi/default.nix @@ -8,7 +8,7 @@ libqmi.overrideAttrs ( pname = "libqmi-unstable"; version = "2019-12-16"; - src = fetchFromGitiles upstreamInfo.components."chromiumos/third_party/libqmi"; + src = fetchFromGitiles upstreamInfo.components."src/third_party/libqmi"; nativeBuildInputs = nativeBuildInputs ++ [ autoreconfHook autoconf-archive gtk-doc docbook-xsl-nons ]; diff --git a/pkgs/os-specific/linux/chromium-os/minigbm/default.nix b/pkgs/os-specific/linux/chromium-os/minigbm/default.nix index 0a3cbf15997..6c532a4deb2 100644 --- a/pkgs/os-specific/linux/chromium-os/minigbm/default.nix +++ b/pkgs/os-specific/linux/chromium-os/minigbm/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "minigbm"; inherit (upstreamInfo) version; - src = fetchFromGitiles upstreamInfo.components."chromiumos/platform/minigbm"; + src = fetchFromGitiles upstreamInfo.components."src/platform/minigbm"; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libdrm ]; diff --git a/pkgs/os-specific/linux/chromium-os/modem-manager/next.nix b/pkgs/os-specific/linux/chromium-os/modem-manager/next.nix index a074e82ff4b..91aa18b3846 100644 --- a/pkgs/os-specific/linux/chromium-os/modem-manager/next.nix +++ b/pkgs/os-specific/linux/chromium-os/modem-manager/next.nix @@ -9,7 +9,7 @@ modemmanager.overrideAttrs ( version = "2019-10-17"; src = fetchFromGitiles - upstreamInfo.components."chromiumos/third_party/modemmanager-next"; + upstreamInfo.components."src/third_party/modemmanager-next"; nativeBuildInputs = nativeBuildInputs ++ [ autoreconfHook libqmi libxslt ]; diff --git a/pkgs/os-specific/linux/chromium-os/modp_b64/default.nix b/pkgs/os-specific/linux/chromium-os/modp_b64/default.nix index 50d91479193..557769336ce 100644 --- a/pkgs/os-specific/linux/chromium-os/modp_b64/default.nix +++ b/pkgs/os-specific/linux/chromium-os/modp_b64/default.nix @@ -3,7 +3,7 @@ common-mk { platformSubdir = "modp_b64"; - src = fetchFromGitiles upstreamInfo.components."aosp/platform/external/modp_b64"; + src = fetchFromGitiles upstreamInfo.components."src/third_party/modp_b64"; installPhase = '' mkdir -p $out/lib diff --git a/pkgs/os-specific/linux/chromium-os/update.py b/pkgs/os-specific/linux/chromium-os/update.py index 1405c534d8b..58a15dbb8e8 100755 --- a/pkgs/os-specific/linux/chromium-os/update.py +++ b/pkgs/os-specific/linux/chromium-os/update.py @@ -13,16 +13,16 @@ from re import MULTILINE, fullmatch, match, search from urllib.request import urlopen # ChromiumOS components used in Nixpkgs -components = [ - 'aosp/platform/external/modp_b64', - 'chromiumos/overlays/chromiumos-overlay', - 'chromiumos/platform/crosvm', - 'chromiumos/platform/minigbm', - 'chromiumos/platform2', - 'chromiumos/third_party/adhd', - 'chromiumos/third_party/kernel', - 'chromiumos/third_party/libqmi', - 'chromiumos/third_party/modemmanager-next', +component_paths = [ + 'src/platform/crosvm', + 'src/platform/minigbm', + 'src/platform2', + 'src/third_party/adhd', + 'src/third_party/chromiumos-overlay', + 'src/third_party/kernel/v5.4', + 'src/third_party/libqmi', + 'src/third_party/modemmanager-next', + 'src/third_party/modp_b64', ] git_root = 'https://chromium.googlesource.com/' @@ -65,14 +65,28 @@ with urlopen(f'{buildspecs_url}{chrome_major_version}/?format=TEXT') as resp: buildspecs.sort(reverse=True) buildspec = splitext(buildspecs[0])[0] -revisions = {} +components = {} # Read the buildspec, and extract the git revisions for each component. with urlopen(f'{buildspecs_url}{chrome_major_version}/{buildspec}.xml?format=TEXT') as resp: xml = base64.decodebytes(resp.read()) root = etree.fromstring(xml) + + default_remote = root.find('default').get('remote') + remotes = {} + for remote in root.findall('remote'): + remotes[remote.get('name')] = remote.get('fetch') + for project in root.findall('project'): - revisions[project.get('name')] = project.get('revision') + name = project.get('name') + path = project.get('path') + remote_name = project.get('remote') or default_remote + remote = remotes[remote_name] + + components[path] = { + 'revision': project.get('revision'), + 'url': f'{remote}/{name}', + } # Initialize the data that will be output from this script. Leave the # rc number in buildspec so nobody else is subject to the same level @@ -84,15 +98,15 @@ paths = {} # Fill in the 'components' dictionary with the output from # nix-prefetch-git, which can be passed straight to fetchGit when # imported by Nix. -for component in components: - name = component.split('/')[-1] - url = f'{git_root}{component}' - rev = revisions[component] +for path in component_paths: + name = path.split('/')[-1] + url = components[path]['url'] + rev = components[path]['revision'] tarball = f'{url}/+archive/{rev}.tar.gz' output = subprocess.check_output(['nix-prefetch-url', '--print-path', '--unpack', '--name', name, tarball]) - (sha256, path) = output.decode('utf-8').splitlines() - paths[component] = path - data['components'][component] = { + (sha256, store_path) = output.decode('utf-8').splitlines() + paths[path] = store_path + data['components'][path] = { 'name': name, 'url': url, 'rev': rev, @@ -100,14 +114,14 @@ for component in components: } # Get the version number of the kernel. -kernel = paths['chromiumos/third_party/kernel'] +kernel = paths['src/third_party/kernel/v5.4'] makefile = open(f'{kernel}/Makefile').read() version = search(r'^VERSION = (.+)$', makefile, MULTILINE)[1] patchlevel = search(r'^PATCHLEVEL = (.*?)$', makefile, MULTILINE)[1] sublevel = search(r'^SUBLEVEL = (.*?)$', makefile, MULTILINE)[1] extra = search(r'^EXTRAVERSION =[ \t]*(.*?)$', makefile, MULTILINE)[1] full_ver = '.'.join(filter(None, [version, patchlevel, sublevel])) + extra -data['components']['chromiumos/third_party/kernel']['version'] = full_ver +data['components']['src/third_party/kernel/v5.4']['version'] = full_ver # Finally, write the output. with open(dirname(__file__) + '/upstream-info.json', 'w') as out: diff --git a/pkgs/os-specific/linux/chromium-os/upstream-info.json b/pkgs/os-specific/linux/chromium-os/upstream-info.json index 5264a72a6c9..842912800bc 100644 --- a/pkgs/os-specific/linux/chromium-os/upstream-info.json +++ b/pkgs/os-specific/linux/chromium-os/upstream-info.json @@ -1,60 +1,60 @@ { "version": "81.12871.0.0-rc1", "components": { - "aosp/platform/external/modp_b64": { - "name": "modp_b64", - "url": "https://chromium.googlesource.com/aosp/platform/external/modp_b64", - "rev": "ae26ad8516036774fd3b6e84a98a89955dcf5f61", - "sha256": "03ja5fkq3wk0qcnfnqcj09lciky6n6zdj544xs1jfssjhz9yj8hi" - }, - "chromiumos/overlays/chromiumos-overlay": { - "name": "chromiumos-overlay", - "url": "https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay", - "rev": "be285b729ef2af700cc248f741af20c387b5a1bc", - "sha256": "18y2icdb3hxqxxaaz8sylw21q2qwcpjyns75ig7ahc4vc1k5hg7s" - }, - "chromiumos/platform/crosvm": { + "src/platform/crosvm": { "name": "crosvm", "url": "https://chromium.googlesource.com/chromiumos/platform/crosvm", "rev": "8b8c01e1ad31718932491e4aee63f56109a138e2", "sha256": "1qmf1k06pwynh15c3nr9m6v90z2pkk930xniwvlvbvnazrk4rllg" }, - "chromiumos/platform/minigbm": { + "src/platform/minigbm": { "name": "minigbm", "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm", "rev": "fbfb338e7db246f05ae68da97141fbd49481584b", "sha256": "11p6v4nmqivyqyc8lmypbwqv9q819lhx6v3igfsv3455mmq02kcb" }, - "chromiumos/platform2": { + "src/platform2": { "name": "platform2", "url": "https://chromium.googlesource.com/chromiumos/platform2", "rev": "6e0d88d0bea8e7cb28a310298cc8c77ed742f60a", "sha256": "13vrbnl3ck8cxiyifc58cs9i0yby92vp5si27ihrx33v6bdlir4s" }, - "chromiumos/third_party/adhd": { + "src/third_party/adhd": { "name": "adhd", "url": "https://chromium.googlesource.com/chromiumos/third_party/adhd", "rev": "f361d5b02623274723bff251dafa1e2a2887b013", "sha256": "1p8iwjwgmcgmzri03ik2jaid8l0ch0bzn6z9z64dix1hlrvrlliw" }, - "chromiumos/third_party/kernel": { - "name": "kernel", + "src/third_party/chromiumos-overlay": { + "name": "chromiumos-overlay", + "url": "https://chromium.googlesource.com/chromiumos/overlays/chromiumos-overlay", + "rev": "be285b729ef2af700cc248f741af20c387b5a1bc", + "sha256": "18y2icdb3hxqxxaaz8sylw21q2qwcpjyns75ig7ahc4vc1k5hg7s" + }, + "src/third_party/kernel/v5.4": { + "name": "v5.4", "url": "https://chromium.googlesource.com/chromiumos/third_party/kernel", "rev": "17611b6e636c8ccae25e873e659d69c20b215815", "sha256": "0an8w3660v2zf2crb68ambg7vzw2rajpjmcby1am08qy37lqsfkd", "version": "5.4.16" }, - "chromiumos/third_party/libqmi": { + "src/third_party/libqmi": { "name": "libqmi", "url": "https://chromium.googlesource.com/chromiumos/third_party/libqmi", "rev": "6267c12fef0be9a95d687bf4b476593eeffbaaf1", "sha256": "00yjjcngjkbgxmmf79ciddk9yq393a94230ahq8vszyfygzhs3rz" }, - "chromiumos/third_party/modemmanager-next": { + "src/third_party/modemmanager-next": { "name": "modemmanager-next", "url": "https://chromium.googlesource.com/chromiumos/third_party/modemmanager-next", "rev": "a4d3a4de1fdab7c282f1a188d2d3d0aaa24f0698", "sha256": "1b1l1jfiyl7fnm29pp9npi0gdlqcw1jmmbigf0qlndqdh0ly2izg" + }, + "src/third_party/modp_b64": { + "name": "modp_b64", + "url": "https://chromium.googlesource.com/aosp/platform/external/modp_b64", + "rev": "ae26ad8516036774fd3b6e84a98a89955dcf5f61", + "sha256": "03ja5fkq3wk0qcnfnqcj09lciky6n6zdj544xs1jfssjhz9yj8hi" } } } diff --git a/pkgs/os-specific/linux/kernel/linux-cros.nix b/pkgs/os-specific/linux/kernel/linux-cros.nix index 6a4a5771b38..789a9fb6fd2 100644 --- a/pkgs/os-specific/linux/kernel/linux-cros.nix +++ b/pkgs/os-specific/linux/kernel/linux-cros.nix @@ -3,7 +3,7 @@ , ... } @ args: let - versionData = upstreamInfo.components."chromiumos/third_party/kernel"; + versionData = upstreamInfo.components."src/third_party/kernel/v5.4"; in with lib; -- 2.26.2

3 15