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.

Sign up for GitHub

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

Jump to bottom

Backport Linux 4.9 to release-16.09 #22274

Merged
merged 3 commits into from Feb 5, 2017
Merged

Backport Linux 4.9 to release-16.09 #22274

merged 3 commits into from Feb 5, 2017

Conversation

obadz
Copy link
Contributor

@obadz obadz commented Jan 29, 2017

Motivation for this change

Also need to to bump virtualbox (bea3209) in order to get it to build.

Both Kernel & Virtualbox seem to work fine. Only thing I noticed is VirtualBox complains about not being able to emit audio. (Audio works fine outside of VirtualBox)

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@obadz
Copy link
Contributor Author

obadz commented Jan 29, 2017

cc @grahamc

@mention-bot
Copy link

@obadz, thanks for your PR! By analyzing the history of the files in this pull request, we identified @grahamc and @aszlig to be potential reviewers.

@edolstra
Copy link
Member

Cherry-picked this instead (except for the VirtualBox change because it uses importJSON, which I think should not be used - I'll revert it on master).

@edolstra edolstra closed this Jan 30, 2017
@obadz
Copy link
Contributor Author

obadz commented Jan 30, 2017

@edolstra, you sure that virtualbox works without the version bump? didn't work for me…

@vcunat
Copy link
Member

vcunat commented Jan 30, 2017 •
edited

Well, that commit didn't introduce importJSON; the expression was/is using it on 16.09 already.

@obadz
Copy link
Contributor Author

obadz commented Jan 30, 2017 •
edited

linuxPackages_4_9.virtualbox doesn't build…

http://hydra.nixos.org/build/47212567/nixlog/1

@obadz
Copy link
Contributor Author

obadz commented Feb 5, 2017

@edolstra,

Ping, virtualbox module still not building: http://hydra.nixos.org/build/47698420/nixlog/1

@obadz obadz reopened this Feb 5, 2017
Peter Hoeg and others added 3 commits February 5, 2017 20:57
@obadz
virtualbox: 5.1.8 -> 5.1.10
a5087e6 
(cherry picked from commit bea3209)
@bachp @obadz
virtualbox: 5.1.10 -> 5.1.14
308c625 
(cherry picked from commit 599df5e)
@bachp @obadz
virtualbox: remove upstream-info.json as it is no longer used
a621e46 
We keep the script as it might be useful in the future.

(cherry picked from commit 5ca3a7e)
@obadz obadz merged commit 67545aa into NixOS:release-16.09 Feb 5, 2017
@vcunat vcunat mentioned this pull request Feb 5, 2017
Closed
47 tasks
@obadz obadz deleted the linux-49-in-16.09 branch February 12, 2017 00:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@obadz @mention-bot @edolstra @vcunat @bachp