Skip to content

Restore linuxManualConfig as linux/kernel/manual-config.nix#35094

Merged
cstrahan merged 1 commit intoNixOS:masterfrom
thefloweringash:restore-linux-manual-config
Feb 20, 2018
Merged

Restore linuxManualConfig as linux/kernel/manual-config.nix#35094
cstrahan merged 1 commit intoNixOS:masterfrom
thefloweringash:restore-linux-manual-config

Conversation

@thefloweringash
Copy link
Member

Motivation for this change

In a recent pull request (#34351) the definition of buildLinux changed from linux/kernel/manual-config.nix to linux/kernel/generic.nix. Since linuxManualConfig is an alias of buildLinux, this means that linuxManualConfig now points to linux/kernel/generic.nix.

I haven't examined the details of the work in this area, but it reads like a simple oversight. The documentation also doesn't seem to have a section on how to build a manually configured kernel. Is linuxManualConfig the intended way?

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
    • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Feb 18, 2018
@cstrahan
Copy link
Contributor

Indeed - otherwise the existing linuxPackages_custom no longer works:

linuxPackages_custom = { version, src, configfile }:
recurseIntoAttrs (linuxPackagesFor (pkgs.linuxManualConfig {
inherit version src configfile stdenv;
allowImportFromDerivation = true;
}));

Note that it expects to be able to pass configfile directly, which is only possible with linux/kernel/manual-config.nix.

I'll merge this, as it does appear to be a minor oversight.

@cstrahan cstrahan merged commit e0af429 into NixOS:master Feb 20, 2018
@teto
Copy link
Member

teto commented Feb 20, 2018

sorry for the inconvenience. I plan to write some doc once #34672 gets merged. I will mention linuxManualConfig which can be handy.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants