linuxManualConfig: always depend on ubootTools #245966
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
reviewed
Sep 30, 2023
| @@ -367,7 +367,7 @@ stdenv.mkDerivation ((drvAttrs config stdenv.hostPlatform.linux-kernel kernelPat | |||
| enableParallelBuilding = true; | |||
|
|
|||
| depsBuildBuild = [ buildPackages.stdenv.cc ]; | |||
| nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal ] | |||
| nativeBuildInputs = [ perl bc nettools openssl rsync gmp libmpc mpfr zstd python3Minimal ubootTools ] | |||
| ++ optional (stdenv.hostPlatform.linux-kernel.target == "uImage") buildPackages.ubootTools | |||
There was a problem hiding this comment.
In the original this was removed
ghost
closed this
|
Doesn't let me push, created #262677 |
ghost
deleted the
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This reapplies #233394 after the revert of #221707 in #245449.
Description of changes
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.
Things done
sandbox = trueset innix.conf? (See Nix manual)nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)