[Backport release-22.05] arm-trusted-firmware: set unfreeIncludeHDCPBlob=false if not used#174690
Closed
ghost wants to merge 1 commit intorelease-22.05from
unknown repository
Closed
[Backport release-22.05] arm-trusted-firmware: set unfreeIncludeHDCPBlob=false if not used#174690ghost wants to merge 1 commit intorelease-22.05from unknown repository
ghost wants to merge 1 commit intorelease-22.05from
unknown repository
Conversation
13 tasks
The `unfreeIncludeHDCPBlob` parameter was introduced as a result of this reviewer request: #148890 (comment) The default value `unfreeIncludeHDCPBlob?true` causes a change in the `meta.license` field for all of the subpackages within `pkgs/misc/arm-trusted-firmware/`, and results in them needing `NIXPKGS_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 set `unfreeIncludeHDCPBlob=false` on these platforms and produce no user-visible change in the resulting output, while preserving the ability to build them without `NIXPKGS_ALLOW_NONFREE=1`. Let's do that.
8 tasks
Author
|
@ofborg build armTrustedFirmwareAllwinner armTrustedFirmwareAllwinnerH616 armTrustedFirmwareQemu armTrustedFirmwareS905 |
Member
|
This should be a backport of the corresponding master change, once it's merged. (With proper "cherry-picked from" info.) |
Author
Thanks, converting to draft in the meantime. |
This pull request was closed.
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
1 participant
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 minimizes the scope of a user-visible behavior change relative to 21.11, so it is worth at least considering backporting it before the release deadline. #172160
Description of changes
The
unfreeIncludeHDCPBlobparameter forarm-trusted-firmwarewas introduced as a result of this reviewer request and ultimately merged as part of #158310. This was part of correcting the fact that, previously,arm-trusted-firmwarehad the wrongmeta.license.The default value
unfreeIncludeHDCPBlob?truecauses a change in themeta.licensefield 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.
For non-Rockchip platforms the file
hdcp.bindoes not get included in the output; the blob is for a Synopsys HDCP core that is currently used only by Rockchip. Therefore we can forceunfreeIncludeHDCPBlob=falseon all non-Rockchip platforms and produce no user-visible change in the resulting output. This preserves the ability to build them withoutNIXPKGS_ALLOW_NONFREE=1.Let's do that.
Thanks to @samueldr for pointing out the overly-broad
NIXPKGS_ALLOW_NONFREE=1requirement.Things done
./result/bin/)nixos/doc/manual/md-to-db.shto update generated release notes