arm-trusted-firmware: set unfree only if hdcp.bin is used; otherwise delete it before building#174691
Conversation
|
Isn't this possible to do with a single parameter? This looks like it may cause issues in the future due to the increased complexity. I like doing this in general. |
There is only one top-level parameter visible outside of the file: The other parameter Perhaps I missed some other strategy here? |
Okay that is not entirely true. The new parameter is not exposed to users of the However it is exposed to users who call So I do think we actually need two parameters here. |
|
Added a comment to explain the new parameter, and reordered the args list to place it next to |
|
Latest push just squashes to a single commit, no other changes. In a moment I will submit another PR with an alternative implementation that might do a better job of addressing @Mindavi's concern. |
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 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>
|
You're pinging people left and right, please be more mindful about what you force-push. |
I know. I don't want to send these pings. Please tell me how to disable or retract the pings. |
|
@ofborg build armTrustedFirmwareRK3399 armTrustedFirmwareAllwinner |
|
Actually you need to @ofborg build pkgsCross.aarch64-multiplatform.armTrustedFirmwareRK3399 I think ofborg runs with |
|
For completeness, to cover the @ofborg build pkgsCross.aarch64-multiplatform.armTrustedFirmwareAllwinner And the @ofborg build pkgsCross.armTrustedFirmwareTools That should cover the important stuff. |
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 (although other companies could license it from Synopsys in the future). Therefore on non-Rockchip we can deletehdcp.binbefore building instead of changing the license. This preserves the ability to build them withoutNIXPKGS_ALLOW_NONFREE=1.Let's do that.
Deleting
hdcp.binensures 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.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