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

linux: fix kernel config options for linux_*hardened #90057

Merged
merged 1 commit into from Jun 10, 2020
Merged

linux: fix kernel config options for linux_*hardened #90057

merged 1 commit into from Jun 10, 2020

Conversation

wizeman
Copy link
Member

@wizeman wizeman commented Jun 10, 2020

Fix config options for linux_hardened and linux_latest_hardened due to #84302.
This is a continuation of #88946.

cc @vcunat @teto

Since I already had staging-next compiled locally and had some free time, I went ahead and fixed these kernel builds too.

Things done
  • 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)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • 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.

@wizeman
linux: fix kernel config options for linux_*hardened
8417052 
Fix config options for linux_hardened and linux_latest_hardened due
to NixOS#84302.
This is a continuation of NixOS#88946.
@wizeman wizeman changed the base branch from master to staging-next June 10, 2020 14:20
teto
teto approved these changes Jun 10, 2020
View reviewed changes
Copy link
Member

@teto teto left a comment

Choose a reason for hiding this comment

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

for context https://lore.kernel.org/patchwork/patch/1051497/. Sounds ok

@teto
Copy link
Member

teto commented Jun 10, 2020

@GrahamcOfBorg build linux_hardkernel_latest

@teto
Copy link
Member

teto commented Jun 10, 2020

reword the commit with the correct attribute, aka one of linux_hardkernel*

@teto
Copy link
Member

teto commented Jun 10, 2020

ha it's unfree...

@vcunat vcunat changed the base branch from staging-next to master June 10, 2020 14:44
@wizeman
Copy link
Member Author

wizeman commented Jun 10, 2020 •
edited

@teto: this is not related to pkgs.linux_hardkernel* (Odroid kernels), this is pkgs.linux_*hardened (kernel hardening).

@teto
Copy link
Member

teto commented Jun 10, 2020

that's what happens when doing several things (badly) at the same time. Ofc it's hardened, just learned about hardkernel, didn't think there could be another match on my search xD

@teto
Copy link
Member

teto commented Jun 10, 2020

@GrahamcOfBorg build linux_hardened

@wizeman wizeman mentioned this pull request Jun 10, 2020
Merged
18 tasks
vcunat
vcunat approved these changes Jun 10, 2020
View reviewed changes
Copy link
Member

@vcunat vcunat left a comment

Choose a reason for hiding this comment

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

Looks good, and all variants from all-packages.nix configure for me now.

@vcunat vcunat merged commit 16658ad into NixOS:master Jun 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@teto teto teto approved these changes

@vcunat vcunat vcunat approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 10.rebuild-linux: 101-500
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@wizeman @teto @vcunat