raspberry-pi/4: dtmerge update #518
Merged
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
carlossless
force-pushed
the
rpi4/dtmerge
branch
from
509f80e to
200f4b2
Compare
carlossless
commented
Dec 17, 2022
| mv "$dtb"{,.in} | ||
|
|
||
| # dtmerge requires a .dtbo ext for dtbo files, otherwise it adds it to the given file implicitly | ||
| dtboWithExt="/tmp/$(basename "${o.dtboFile}").dtbo" |
There was a problem hiding this comment.
I'm unsure if this would be the most conventional approach to doing this.
|
CC: @Mic92 @06kellyjac |
|
Would this also work with current nixpkgs 22.11? |
carlossless
force-pushed
the
rpi4/dtmerge
branch
from
200f4b2 to
4f79162
Compare
|
@Mic92 underlying issue failed both on 22.05 and 22.11. I tested the fix only on 22.11 and it worked fine, but now that you mentioned it, I did go back to trying 22.05 and the derivation was failing. The adjustment I just made should fix that. I tested 22.05 and 22.11 against it. |
|
bors merge |
bors bot
added a commit
that referenced
this pull request
Dec 21, 2022
518: raspberry-pi/4: dtmerge update r=Mic92 a=carlossless Co-authored-by: Karolis Stasaitis <[email protected]>
|
borse abort |
|
bors cancel |
|
Canceled. |
Mic92
reviewed
Dec 21, 2022
Co-authored-by: Jörg Thalheim <[email protected]>
carlossless
force-pushed
the
rpi4/dtmerge
branch
from
76670fa to
93b1cdb
Compare
|
bors merge |
|
Build succeeded:
|
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.
Description of changes
Fixes the issue reported in #503 and updates the apply-overlays-dtmerge overlay with the nixpkgs changes made in NixOS/nixpkgs@916ca8f
Things done
nixos-hardwareandimporting it via
<nixos-hardware>or Flake input