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_custom: fix missing argument and add test #38034

Closed
wants to merge 1 commit into from

Conversation

roberth
Copy link
Member

@roberth roberth commented Mar 29, 2018

See also backport to 18.03, #38035

The required argument 'hostPlatform' was missing from linuxPackages_custom's
call to linuxManualConfig.

In order to prevent this in the future, this commit adds
linuxPackages_custom_tinyconfig_kernel so linuxPackages_custom gets tested.

This also adds linuxConfig, to derivate default linux configurations
via make defconfig, make tinyconfig, etc.

Motivation for this change
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.

The required argument 'hostPlatform' was missing from linuxPackages_custom's
call to linuxManualConfig.

In order to prevent this in the future, this commit adds
linuxPackages_custom_tinyconfig_kernel so linuxPackages_custom gets tested.

This also adds linuxConfig, to derivate default linux configurations
via make defconfig, make tinyconfig, etc.
@roberth
Copy link
Member Author

roberth commented Mar 29, 2018

@GrahamcOfBorg build linuxPackages_custom_tinyconfig_kernel

@roberth
Copy link
Member Author

roberth commented Apr 4, 2018

@thoughtpolice ready for merge?

Copy link
Member

@thoughtpolice thoughtpolice left a comment

Choose a reason for hiding this comment

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

LGTM otherwise, thanks for adding the test, too! One small question but otherwise I think this is fine.

@@ -35,6 +35,8 @@ in {
extraMeta ? {},
# Whether to utilize the controversial import-from-derivation feature to parse the config
allowImportFromDerivation ? false,
# ignored
features ? null,
Copy link
Member

Choose a reason for hiding this comment

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

Excuse me if I'm missing something obvious -- is this change necessary? Am I missing something?

Copy link
Member Author

Choose a reason for hiding this comment

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

features has become a mandatory argument for kernels. I don't remember where it is passed as an argument, but without it evaluation fails because some other code expects to be able to pass a features argument. I'm not sure where that is, as I said, but this override supports the idea.
This ignores the features parameter entirely, which kind of seems appropriate for a custom kernel. Of course someone could write the code to validate the custom configuration against it and expose it via passthru but that's not going to be part of this bugfix.

Copy link
Member

Choose a reason for hiding this comment

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

Ah, thanks for the follow up! (I reviewed it a bit 'out of context' since I was busy earlier and hadn't looked deeper). This otherwise looks good to me; I'll merge this (and the backport) soon...

@thoughtpolice
Copy link
Member

Sigh. I merged this manually and added a Closes tag (7f25b26), but GitHub didn't close this! Argh...

Thanks again @roberth, sorry about the delay.

thoughtpolice pushed a commit that referenced this pull request Apr 7, 2018
The required argument 'hostPlatform' was missing from linuxPackages_custom's
call to linuxManualConfig.

In order to prevent this in the future, this commit adds
linuxPackages_custom_tinyconfig_kernel so linuxPackages_custom gets tested.

This also adds linuxConfig, to derivate default linux configurations
via make defconfig, make tinyconfig, etc.

Closes #38034.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
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

3 participants