[Backport release-22.05] arm-trusted-firmware: unfree only if hdcp.bin used #176339
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 is a cherry-pick of 8485bfc which was merged from issue #174691.
This commit reduces the scope of a breaking change relative to 21.11.
Specifically, it allows the arm-trusted-firmware for non-Rockchip devices to be built without
NIXPKGS_ALLOW_NONFREE=1
, as was possible in 21.11.Description of changes
The
unfreeIncludeHDCPBlob
parameter was introduced as a result ofthis reviewer request:
#148890 (comment)
The default value
unfreeIncludeHDCPBlob?true
causes a change in themeta.license
field for all of the subpackages withinpkgs/misc/arm-trusted-firmware/
, and results in them needingNIXPKGS_ALLOW_NONFREE=1
.For non-Rockchip platforms the file hdcp.bin does not get included in
the output; the blob is for a Synopsys HDCP core that is currently
used only by Rockchip (although other companies could license it from
Synopsys in the future). Therefore on non-Rockchip we can delete
hdcp.bin before building instead of changing the license. This
preserves the ability to build them without NIXPKGS_ALLOW_NONFREE=1.
Let's do that.
Deleting hdcp.bin ensures that we won't be caught by surprise if some
future non-Rockchip Arm CPU licenses the same Synopsys HDCP core that
Rockchip is using.
Use easier-to-follow names for controlling the blob
inclusion/exclusion. Also, if the blob is believed to be unnecessary,
delete it beforehand so we will know if we were wrong about that belief.
Co-authored-by: Sandro sandro.jaeckel@gmail.com
(cherry picked from commit 8485bfc)
Things done
sandbox = true
set 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/
)nixos/doc/manual/md-to-db.sh
to update generated release notes