Skip to content

linuxManualConfig: restore functionality of isModular and buildDTBs#244447

Merged
1 commit merged intomasterfrom
unknown repository
Jul 20, 2023
Merged

linuxManualConfig: restore functionality of isModular and buildDTBs#244447
1 commit merged intomasterfrom
unknown repository

Conversation

@ghost
Copy link

@ghost ghost commented Jul 20, 2023

Description of changes

Since #221707 the isModular and buildDTBs parameters no longer function properly -- they now control only whether or not these elements are copied to the outpath; they are build unconditionally in any case.

This commit reverts the part of #221707 which caused this behavior change.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 23.11 Release Notes (or backporting 23.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Since #221707 the `isModular`
and `buildDTBs` parameters no longer function properly -- they now
control only whether or not these elements are copied to the
outpath; they are build unconditionally in any case.

This commit reverts the part of #221707 which caused this behavior
change.
@ghost ghost mentioned this pull request Jul 20, 2023
12 tasks
@github-actions github-actions bot added the 6.topic: kernel The Linux kernel label Jul 20, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Jul 20, 2023
@ghost ghost merged commit 42fcf08 into NixOS:master Jul 20, 2023
@ghost ghost mentioned this pull request Jul 25, 2023
2 tasks
@ghost ghost deleted the pr/fix/restore-ability-to-build-kernel-without-modules branch January 23, 2024 06:47
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

6.topic: kernel The Linux kernel 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

0 participants