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.

Sign up for GitHub

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

Jump to bottom

thermald: 2.3 -> 2.4.1 #105745

Merged
merged 3 commits into from Dec 3, 2020
Merged

thermald: 2.3 -> 2.4.1 #105745

merged 3 commits into from Dec 3, 2020

Conversation

archseer
Copy link
Member

@archseer archseer commented Dec 3, 2020

Motivation for this change

2.4 comes with massive improvements to adaptive mode.

Note: I've removed the adaptive option that was added in the last package update and set it to always on to match the change upstream.

thermald will automatically switch to passive mode if needed (some fixes for that landed in 2.4), and upstream sets it to always on.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@archseer
Copy link
Member Author

archseer commented Dec 3, 2020

/cc @Emantor

@archseer
Copy link
Member Author

archseer commented Dec 3, 2020

Note: Adaptive mode also completely ignores the manual config file and instead uses DPTF tables. Maybe we should add a note about that to the manual config option.

@ofborg ofborg bot requested a review from abbradar December 3, 2020 02:39
@archseer
thermald: 2.3 -> 2.4.1
f0e25ca
@archseer
thermald: Always enable adaptive mode.
05bd810 
There was some issues with the fallback to passive mode on 2.3, but on
2.4 adaptive mode is always enabled upstream and thermald will fallback
to passive if necessary.

https://github.com/intel/thermal_daemon/blob/a6e68a65b53a3d7a023c9b45db31ceffbd7e5dfb/data/thermald.service.in#L9
@archseer
maintainers: add archseer
873be87
@SuperSandro2000
Copy link
Member

Result of nixpkgs-review pr 105745 run on x86_64-linux 1

1 package blacklisted:
  • tests.nixos-functions.nixos-test
1 package built:
  • thermald

@SuperSandro2000 SuperSandro2000 merged commit c1695ad into NixOS:master Dec 3, 2020
@jboyens
Copy link
Contributor

jboyens commented Dec 7, 2020

There is a bug in this PR. The --dbus-enable line MUST have a \ on the end of it. Otherwise the command fails.

@archseer
Copy link
Member Author

archseer commented Dec 7, 2020

Sorry about that, looks like I dropped it during a rebase. @jboyens can you make a quick PR? I can do it in a few hours otherwise

@archseer archseer mentioned this pull request Dec 7, 2020
Merged
10 tasks
@archseer
Copy link
Member Author

archseer commented Dec 7, 2020

I've made a followup #106297

@archseer archseer deleted the thermald-2-4 branch December 7, 2020 23:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Emantor Emantor Emantor approved these changes

@abbradar abbradar Awaiting requested review from abbradar

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 1-10 12. first-time contribution
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@archseer @SuperSandro2000 @jboyens @Emantor @Janik-Haag