Skip to content

linuxManualConfig: always depend on ubootTools#262677

Merged
Artturin merged 1 commit intoNixOS:stagingfrom
Artturin:repick2
Oct 22, 2023
Merged

linuxManualConfig: always depend on ubootTools#262677
Artturin merged 1 commit intoNixOS:stagingfrom
Artturin:repick2

Conversation

@Artturin
Copy link
Copy Markdown
Member

Since 41f788b ("linuxManualConfig: use the default make target"), we don't know ahead of time whether the kernel build will attempt to produce a uImage in addition to whatever we're expecting it to build. ubootTools is not a big dependency, so let's just always include it.

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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 41f788b ("linuxManualConfig: use the default make target"),
we don't know ahead of time whether the kernel build will attempt to
produce a uImage in addition to whatever we're expecting it to build.
ubootTools is not a big dependency, so let's just always include it.
@Artturin Artturin requested a review from a user October 22, 2023 06:09
@github-actions github-actions bot added the 6.topic: kernel The Linux kernel label Oct 22, 2023
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package 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 Oct 22, 2023
@Artturin Artturin merged commit 3039676 into NixOS:staging Oct 22, 2023
@Artturin Artturin deleted the repick2 branch October 22, 2023 07:57
samueldr added a commit to samueldr/nixpkgs that referenced this pull request Apr 12, 2024
This issue was (understandably) introduced with NixOS#262677.
K900 pushed a commit to K900/nixpkgs that referenced this pull request Apr 13, 2024
This issue was (understandably) introduced with NixOS#262677.
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: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package 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.

2 participants