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

[Backport release-22.05] arm-trusted-firmware: set unfreeIncludeHDCPBlob=false if not used #174686

Closed
wants to merge 1 commit into from

Conversation

ghost
Copy link

@ghost ghost commented May 26, 2022

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 unfreeIncludeHDCPBlob parameter for arm-trusted-firmware was 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-firmware had the wrong meta.license.

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.

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. Therefore we can force unfreeIncludeHDCPBlob=false on all non-Rockchip platforms and produce no user-visible change in the resulting output. This preserves the ability to build them without NIXPKGS_ALLOW_NONFREE=1.

Let's do that.

Thanks to @samueldr for pointing out the overly-broad NIXPKGS_ALLOW_NONFREE=1 requirement.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
  • 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.

@ghost ghost marked this pull request as draft May 26, 2022 06:54
@ghost ghost marked this pull request as ready for review May 26, 2022 06:55
@ghost ghost marked this pull request as draft May 26, 2022 06:58
@ghost ghost marked this pull request as ready for review May 26, 2022 07:01
@ghost
Copy link
Author

ghost commented May 26, 2022

@ofborg build armTrustedFirmwareAllwinner armTrustedFirmwareAllwinnerH616 armTrustedFirmwareQemu armTrustedFirmwareS905

@ofborg ofborg bot requested a review from lopsided98 May 26, 2022 07:09
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux labels May 26, 2022
@ghost ghost changed the base branch from master to release-22.05 May 26, 2022 07:12
@github-actions github-actions bot removed 6.topic: GNOME GNOME desktop environment and its underlying platform 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: kernel The Linux kernel 6.topic: erlang 6.topic: stdenv Standard environment 6.topic: pantheon The Pantheon desktop environment 6.topic: vim 6.topic: ocaml 6.topic: policy discussion 6.topic: steam Steam game store/launcher (store.steampowered.com) 8.has: module (update) This PR changes an existing module in `nixos/` 8.has: documentation This PR adds or changes documentation 8.has: changelog 6.topic: xfce The Xfce Desktop Environment 6.topic: emacs Text editor 6.topic: fetch 6.topic: python labels May 26, 2022
@ghost
Copy link
Author

ghost commented May 26, 2022

Well, apparently I bungled the base-branch change and github mass-requested a review from all the CODEOWNERS.

I will close this and reopen it because that is the only way I know of fixing it.

@ghost ghost closed this May 26, 2022
@ghost ghost deleted the pr/atf-set-unfreeIncludeHDCPBlob branch May 26, 2022 07:17
@ghost ghost restored the pr/atf-set-unfreeIncludeHDCPBlob branch May 26, 2022 07:18
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 ghost deleted the pr/atf-set-unfreeIncludeHDCPBlob branch January 23, 2024 06:47
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Development

Successfully merging this pull request may close these issues.

0 participants