arm-trusted-firmware: set unfreeIncludeHDCPBlob=false if not used #175372
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 an alternative to #174691; please do not merge both, just one or the other.
Compared to #174691 this PR breaks out
buildArmTrustedFirmware
into a separate filebuild.nix
so it has its own 'callPackageinvocation, separate from the CPU-specific expressions which were previously in the same file. This allows to eliminate the redundant
unfreeIncludeHDCPBlob` parameter.Now each expression has exactly one parameter in scope:
buildArmTrustedFirmware
has a parameterdeleteHDCPBlobBeforeBuild
armTrustedFirmware${PLATFOM}
has a parameterunfreeIncludeHDCPBlob
Description of changes
The
unfreeIncludeHDCPBlob
parameter was introduced as a result of this 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 Rockchip platforms this change is unavoidable; we are correcting an incorrect license declaration. However for non-Rockchip platforms the file
hdcp.bin
does not get included in the output. Therefore we can setunfreeIncludeHDCPBlob=false
on these platforms and produce no user-visible change in the resulting output, while preserving the ability to build them withoutNIXPKGS_ALLOW_NONFREE=1
.Let's do that.
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