Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

arm-trusted-firmware: set unfreeIncludeHDCPBlob=false if not used #175372

Closed
wants to merge 1 commit into from
Closed

arm-trusted-firmware: set unfreeIncludeHDCPBlob=false if not used #175372

wants to merge 1 commit into from

Conversation

ghost
Copy link

@ghost ghost commented May 29, 2022

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 file build.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 redundantunfreeIncludeHDCPBlob` parameter.

Now each expression has exactly one parameter in scope:

  • buildArmTrustedFirmware has a parameter deleteHDCPBlobBeforeBuild

  • armTrustedFirmware${PLATFOM} has a parameter unfreeIncludeHDCPBlob

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 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.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

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.
@ghost
Copy link
Author

ghost commented Jun 19, 2022

Closed by #174691

@ghost ghost closed this Jun 19, 2022
@ghost ghost deleted the pr/atf-set-unfreeIncludeHDCPBlob-alternative branch June 19, 2022 07:19
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

0 participants