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

linuxPackages.virtualboxGuestAdditions: apply mp-r0drv-linux.c patch #69500

Merged
merged 1 commit into from Sep 27, 2019

Conversation

flokli
Copy link
Contributor

@flokli flokli commented Sep 26, 2019

These don't use a the virtualbox sources, but an iso as src, and we need
to add the kernel 5.3 patch aswell.

As for some reason the source files are present on the .iso with Windows
Line endings (sic!), call dos2unix first.

Unfortunately, we can't use the same kernel-5.3-fix.patch as virtualbox
itself, as some files are missing and paths are different.

Motivation for this change

Fixes #65689.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @wkral @ambrop72

These don't use a the virtualbox sources, but an iso as src, and we need
to add the kernel 5.3 patch aswell.

As for some reason the source files are present on the .iso with Windows
Line endings (sic!), call dos2unix first.

Unfortunately, we can't use the same kernel-5.3-fix.patch as virtualbox
itself, as some files are missing and paths are different.
Copy link
Contributor

@wkral wkral left a comment

Choose a reason for hiding this comment

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

Tested building with latest released unstable: f0fec24 + patch for host virtualbox + this commit.

@flokli
Copy link
Contributor Author

flokli commented Sep 26, 2019

what do you mean by "patch for host virtualbox"?

@wkral
Copy link
Contributor

wkral commented Sep 26, 2019

The commit from #69323 as it hasn't been built into unstable channel yet. Since my system is pointed at that channel I figured it would isolate these changes without introducing anything from head of master since it seems there are a lot of tests failing on hydra right now.

@flokli flokli merged commit 8058883 into NixOS:master Sep 27, 2019
@flokli flokli deleted the virtualbox-fix-guest-additions branch September 27, 2019 13:46
@flokli
Copy link
Contributor Author

flokli commented Sep 27, 2019

Alright :-)

@flokli
Copy link
Contributor Author

flokli commented Sep 27, 2019

Backported to 19.09 in 9c9bd27.

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.

Virtualbox guest fails with latest kernel. Missing ttm library.
2 participants