Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

crosvm: 104.0 -> 107.1 #193746

Merged
merged 4 commits into from Nov 18, 2022
Merged

crosvm: 104.0 -> 107.1 #193746

merged 4 commits into from Nov 18, 2022

Conversation

alyssais
Copy link
Member

Description of changes
Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

Copy link
Contributor

@astro astro left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works but only if I keep passing --seccomp-log-failures. Without it fails on x86_64:

[2022-10-03T18:36:28.237798106+02:00 INFO  devices::acpi] Listening on acpi_mc_group of acpi_event family
[2022-10-03T18:36:28.380173248+02:00 ERROR crosvm::crosvm::sys::unix] child xhci controller (pid 1889588) died: signo 17, status 31, code 3
[2022-10-03T18:36:28.380920135+02:00 ERROR devices::proxy] failed write to child device process xhci controller: failed to send packet: Broken pipe (os error 32)
[2022-10-03T18:36:28.381030180+02:00 ERROR devices::proxy] failed to read result of Shutdown from child device process xhci controller: tube was disconnected
[2022-10-03T18:36:28.446001964+02:00 INFO  crosvm] crosvm has exited normally
[2022-10-03T18:36:28.446516208+02:00 INFO  crosvm] exiting with success

nesteroff pushed a commit to nesteroff/nixpkgs-spectrum that referenced this pull request Oct 11, 2022
Despite having moved the main repo to crosvm/crosvm, release branches
are still only being created on chromiumos/platform/crosvm.  So we
should have crosvm/crosvm as the homepage, but fetch from
chromiumos/platform/crosvm.

Link: NixOS/nixpkgs#193746
Signed-off-by: Alyssa Ross <alyssa.ross@unikie.com>
vilvo pushed a commit to tiiuae/nixpkgs-spectrum that referenced this pull request Oct 13, 2022
Despite having moved the main repo to crosvm/crosvm, release branches
are still only being created on chromiumos/platform/crosvm.  So we
should have crosvm/crosvm as the homepage, but fetch from
chromiumos/platform/crosvm.

Link: NixOS/nixpkgs#193746
Signed-off-by: Alyssa Ross <alyssa.ross@unikie.com>
unbel13ver pushed a commit to tiiuae/nixpkgs-spectrum that referenced this pull request Oct 14, 2022
Despite having moved the main repo to crosvm/crosvm, release branches
are still only being created on chromiumos/platform/crosvm.  So we
should have crosvm/crosvm as the homepage, but fetch from
chromiumos/platform/crosvm.

Link: NixOS/nixpkgs#193746
Signed-off-by: Alyssa Ross <alyssa.ross@unikie.com>
vilvo pushed a commit to tiiuae/nixpkgs-spectrum that referenced this pull request Oct 26, 2022
Despite having moved the main repo to crosvm/crosvm, release branches
are still only being created on chromiumos/platform/crosvm.  So we
should have crosvm/crosvm as the homepage, but fetch from
chromiumos/platform/crosvm.

Link: NixOS/nixpkgs#193746
Signed-off-by: Alyssa Ross <alyssa.ross@unikie.com>
Message-Id: <20220930210906.1696349-2-alyssa.ross@unikie.com>
@alyssais alyssais marked this pull request as draft November 15, 2022 12:55
alyssais added a commit to alyssais/nixpkgs that referenced this pull request Nov 15, 2022
Despite having moved the main repo to crosvm/crosvm, release branches
are still only being created on chromiumos/platform/crosvm.  So we
should have crosvm/crosvm as the homepage, but fetch from
chromiumos/platform/crosvm.

Link: NixOS#193746
Signed-off-by: Alyssa Ross <alyssa.ross@unikie.com>
Message-Id: <20220930210906.1696349-2-alyssa.ross@unikie.com>
@alyssais
Copy link
Member Author

I've updated this to the latest crosvm, and backported a patch that fixes the sandboxing issue, but there's a new problem, which is that it doesn't build for aarch64.

Despite having moved the main repo to crosvm/crosvm, release branches
are still only being created on chromiumos/platform/crosvm.  So we
should have crosvm/crosvm as the homepage, but fetch from
chromiumos/platform/crosvm.

Link: NixOS#193746
For R106 and onwards, upstream has gone back to not having a
separation between chromeos and not.
crosvm now includes a Cargo.lock again, so we don't need to vendor it
into Nixpkgs.

Its build system now compiles the seccomp policies into the binary, so
we don't need to build and install those ourselves any more.
This is no longer required as crosvm now includes a Cargo.lock in-tree
again.
@alyssais alyssais changed the title crosvm: 104.0 -> 105.0 crosvm: 104.0 -> 107.1 Nov 18, 2022
@alyssais alyssais marked this pull request as ready for review November 18, 2022 13:07
@alyssais
Copy link
Member Author

aarch64 build is fixed, both cross and native.

@astro can you check everything looks okay for you?

@astro
Copy link
Contributor

astro commented Nov 18, 2022

Nice! Works for me on x86_64.

@alyssais alyssais merged commit 4c80e36 into NixOS:master Nov 18, 2022
alyssais added a commit that referenced this pull request Nov 18, 2022
Despite having moved the main repo to crosvm/crosvm, release branches
are still only being created on chromiumos/platform/crosvm.  So we
should have crosvm/crosvm as the homepage, but fetch from
chromiumos/platform/crosvm.

Link: #193746
@alyssais alyssais deleted the crosvm-105 branch November 18, 2022 17:46
astro added a commit to astro/microvm.nix that referenced this pull request Nov 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants