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

virtualbox: 6.0.12 -> 6.0.14 #74260

Merged
merged 3 commits into from Dec 12, 2019
Merged

virtualbox: 6.0.12 -> 6.0.14 #74260

merged 3 commits into from Dec 12, 2019

Conversation

B4dM4n
Copy link
Contributor

@B4dM4n B4dM4n commented Nov 26, 2019

Motivation for this change

The virtualbox build is failing with linuxPackages_5_4. Instead of fixing the build for the old release I decided to update the package and fix the compile errors afterwards.

Things done
  • Tested VM boot in VirtualBox GUI and VBoxManage startvm --type=headless with
boot.kernelPackages = pkgs.linuxPackages_5_4;
virtualisation.virtualbox.host = {
  enableExtensionPack = true;
  enable = true;
};
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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)
nix-build --no-out-link -I nixpkgs=$NIXPKGS '<nixpkgs/nixos/tests/virtualbox.nix>'
nix-build --no-out-link -I nixpkgs=$NIXPKGS '<nixpkgs/nixos/tests/virtualbox.nix>' --arg enableUnfree true --arg useKvmNestedVirt true --arg use64bitGuest true
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
2 package failed to build:
linuxPackages_latest-libre.virtualbox linuxPackages_latest-libre.virtualboxGuestAdditions

31 package were built:
linuxPackages-libre.virtualbox linuxPackages-libre.virtualboxGuestAdditions linuxPackages.virtualbox linuxPackages.virtualboxGuestAdditions linuxPackages_4_14.virtualbox linuxPackages_4_14.virtualboxGuestAdditions linuxPackages_4_4.virtualbox linuxPackages_4_4.virtualboxGuestAdditions linuxPackages_4_9.virtualbox linuxPackages_4_9.virtualboxGuestAdditions linuxPackages_5_3.virtualbox linuxPackages_5_3.virtualboxGuestAdditions linuxPackages_5_4.virtualbox linuxPackages_5_4.virtualboxGuestAdditions linuxPackages_hardened.virtualbox linuxPackages_hardened.virtualboxGuestAdditions linuxPackages_latest_hardened.virtualbox linuxPackages_latest_hardened.virtualboxGuestAdditions linuxPackages_latest_xen_dom0.virtualbox linuxPackages_latest_xen_dom0.virtualboxGuestAdditions linuxPackages_testing_bcachefs.virtualbox linuxPackages_testing_bcachefs.virtualboxGuestAdditions linuxPackages_testing_hardened.virtualbox linuxPackages_testing_hardened.virtualboxGuestAdditions linuxPackages_xen_dom0.virtualbox linuxPackages_xen_dom0.virtualboxGuestAdditions virtualbox virtualboxExtpack virtualboxHardened virtualboxHeadless virtualboxWithExtpack
  • 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 @flokli @svanderburg @cdepillabout

@florianjacob
Copy link
Contributor

related / duplicate: #75463

./kernel-5.3-fix.patch
# Kernel 5.4 fix, should be fixed with next upstream release
# https://www.virtualbox.org/ticket/18945
./kernel-5.4-fix.patch
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you fetchpatch these instead of adding them to the repo?

Copy link
Contributor

Choose a reason for hiding this comment

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

You could literally copy the fetchpatch statements from #75463.

Copy link
Member

Choose a reason for hiding this comment

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

I never got the build completely through with the patches in that PR so unfortunately it wouldn't be sufficient to copy that PR.

Copy link
Member

Choose a reason for hiding this comment

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

But perhaps it would work with copying them to the guest-additions package as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You could literally copy the fetchpatch statements from #75463.

I could not find the patch URLs before on the virtualbox site. Using the URLs from #75463 is working great.

I never got the build completely through with the patches in that PR so unfortunately it wouldn't be sufficient to copy that PR.

There is a third cahngeset which was missing in your PR. Adding https://www.virtualbox.org/changeset/81649/vbox builds fine.

But perhaps it would work with copying them to the guest-additions package as well?

It's not so easy to use fetchpatch for the guest additions. Only some of the changes are needed and they are in multiple sub folders. I'm looking for a solution to reuse the upstream patches.

@rycee rycee added the 9.needs: port to stable A PR needs a backport to the stable release. label Dec 11, 2019
@B4dM4n
Copy link
Contributor Author

B4dM4n commented Dec 12, 2019

I updated the PR to use fetchpatch for virtualbox itself and the guest additions.

The guest additions patches are a bit messy, as they need to reused with different prefixes and includes.

@flokli
Copy link
Contributor

flokli commented Dec 12, 2019

@GrahamcOfBorg test virtualbox

@flokli flokli merged commit 135ebdb into NixOS:master Dec 12, 2019
@rycee
Copy link
Member

rycee commented Dec 13, 2019

I built 19.09 with these commits (unfortunately the fixup patches were not squashed) and everything seems to work well on Linux 5.4. Unless complaints arise I'll therefore cherry-pick the changes to the release-19.09 branch tomorrow (Dec 14).

rycee referenced this pull request in rafaeldff/nixpkgs Dec 27, 2019
This reverts commit 63c756d.

Fixes issue NixOS#74916
@B4dM4n B4dM4n deleted the virtualbox-update branch January 18, 2020 16:59
winterdeaf added a commit to winterdeaf/nixpkgs that referenced this pull request Mar 13, 2020
Update Virtualbox to its latest version. This allows compilation against
kernel >= 5.4 to succeed without further patches (see NixOS#74260, build
would fail for linux-5.5.5 to 5.5.9).
@winterdeaf winterdeaf mentioned this pull request Mar 13, 2020
10 tasks
alyssais pushed a commit that referenced this pull request Mar 13, 2020
Update Virtualbox to its latest version. This allows compilation against
kernel >= 5.4 to succeed without further patches (see #74260, build
would fail for linux-5.5.5 to 5.5.9).
dtzWill pushed a commit to dtzWill/nixpkgs that referenced this pull request Mar 14, 2020
Update Virtualbox to its latest version. This allows compilation against
kernel >= 5.4 to succeed without further patches (see NixOS#74260, build
would fail for linux-5.5.5 to 5.5.9).

(cherry picked from commit 2b99b29)
winterdeaf added a commit to winterdeaf/nixpkgs that referenced this pull request Mar 15, 2020
Update Virtualbox to its latest version. This allows compilation against
kernel >= 5.4 to succeed without further patches (see NixOS#74260, build
would fail for linux-5.5.5 to 5.5.9).

(cherry picked from commit 3132c23)
stigok pushed a commit to stigok/nixpkgs that referenced this pull request Jun 12, 2020
Update Virtualbox to its latest version. This allows compilation against
kernel >= 5.4 to succeed without further patches (see NixOS#74260, build
would fail for linux-5.5.5 to 5.5.9).

(cherry picked from commit 3132c23)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants