linuxManualConfig: always depend on ubootTools#233394
Merged
Ericson2314 merged 1 commit intoNixOS:stagingfrom May 22, 2023
Merged
linuxManualConfig: always depend on ubootTools#233394Ericson2314 merged 1 commit intoNixOS:stagingfrom
Ericson2314 merged 1 commit intoNixOS:stagingfrom
Conversation
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.
Member
|
Idea makes sense to me. |
Contributor
|
Backport failed for Please cherry-pick the changes locally. git fetch origin staging-23.05
git worktree add -d .worktree/backport-233394-to-staging-23.05 origin/staging-23.05
cd .worktree/backport-233394-to-staging-23.05
git checkout -b backport-233394-to-staging-23.05
ancref=$(git merge-base 2a264a4a2070325921b13230b77620b175d2c559 e5e02f3214ae381142606cf5defc35888d73f883)
git cherry-pick -x $ancref..e5e02f3214ae381142606cf5defc35888d73f883 |
12 tasks
12 tasks
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
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/)