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

kmod: 23 -> 24 and update kmod-blacklist-ubuntu to zesty #23890

Merged
merged 3 commits into from
Mar 17, 2017

Conversation

peterhoeg
Copy link
Member

Motivation for this change
  • kmod was out of date.
  • kmod-blacklist-ubuntu was very out of date
  • kmod-blacklist-ubuntu blacklists i2c_i801 for no good reason

I've tried building them and they all build fine. I haven't done nox-review wip as it causes quite a bit of rebuilding.

@globin, would you consider this for 17.03 or is it too late?

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.

@mention-bot
Copy link

@peterhoeg, thanks for your PR! By analyzing the history of the files in this pull request, we identified @vcunat, @edolstra and @abbradar to be potential reviewers.

@Mic92
Copy link
Member

Mic92 commented Mar 16, 2017

I would also vote for a backport of the blacklist. The list is supposed to be in sync with the kernel.

@fpletz fpletz added this to the 17.03 milestone Mar 16, 2017
@peterhoeg peterhoeg merged commit cb73e06 into NixOS:master Mar 17, 2017
@peterhoeg peterhoeg deleted the u/kmod branch March 17, 2017 08:01
@peterhoeg peterhoeg restored the u/kmod branch March 17, 2017 08:28
@vcunat
Copy link
Member

vcunat commented Mar 22, 2017

Updating the kmod blacklist broke our X tests (bisected). Good test case: nix-build nixos/release.nix -A tests.i3wm.x86_64-linux – the X log will end with:

(II) modesetting: Driver for Modesetting Kernel Drivers: kms
(EE) open /dev/dri/card0: No such file or directory
(WW) Falling back to old probe method for modesetting
(EE) open /dev/dri/card0: No such file or directory
(EE) Screen 0 deleted because of no matching config section.
(II) UnloadModule: "modesetting"
(EE) Device(s) detected, but none match those in the config file.
(EE)
Fatal server error:
(EE) no screens found(EE)
(EE)
Please consult the The X.Org Foundation support
   at http://wiki.x.org
 for help.
(EE) Please also check the log file at "/dev/null" for additional information.
(EE)
(EE) Server terminated with error (1). Closing log file.

(then the service will restart a few times and later the test will wait for a timeout.)

Any ideas why this happens? Note that we've picked this problem into 17.03 as well /cc @globin.

@vcunat
Copy link
Member

vcunat commented Mar 22, 2017

The correct log opens /dev/dri/card0 without problems.

@globin
Copy link
Member

globin commented Mar 22, 2017

If nobody has a solution until tomorrow evening, I'll revert on the release branch

vcunat added a commit that referenced this pull request Mar 22, 2017
This reverts commit 0c262a6.
It broke X tests, though it's not clear why ATM.  Discussion:
#23890 (comment)
@vcunat
Copy link
Member

vcunat commented Mar 22, 2017

I decided to revert the commit on master immediately, because no rebuilds are caused and nixos-unstable channel is over two weeks old now. We can easily re-revert later.

@globin
Copy link
Member

globin commented Mar 23, 2017

Re-reverted in 785e45a with a fix

@peterhoeg peterhoeg deleted the u/kmod branch March 23, 2017 09:31
@vcunat
Copy link
Member

vcunat commented Mar 23, 2017

Hmm, I've completely forgotten 9f7d7ad.

@peterhoeg peterhoeg restored the u/kmod branch March 23, 2017 13:35
@peterhoeg peterhoeg deleted the u/kmod branch April 10, 2017 06:13
@peterhoeg peterhoeg restored the u/kmod branch April 10, 2017 11:24
@peterhoeg peterhoeg deleted the u/kmod branch April 11, 2017 00:58
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

7 participants