Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/thermald.git#b06314325298a76c09252475118f700d3c0f6248
This commit is contained in:
DistroBaker 2021-02-13 21:30:32 +00:00
parent 5a2287159f
commit 7b7dc0e689
2 changed files with 26 additions and 1 deletions

16
issue_291.diff Normal file
View File

@ -0,0 +1,16 @@
diff --git a/src/thd_engine_adaptive.cpp b/src/thd_engine_adaptive.cpp
index 1464006..c0ab87e 100644
--- a/src/thd_engine_adaptive.cpp
+++ b/src/thd_engine_adaptive.cpp
@@ -1190,9 +1190,9 @@ int cthd_engine_adaptive::install_passive(struct psv *psv) {
int target_state = 0;
if (psv->limit.length()) {
- if (psv->limit == "MAX") {
+ if (psv->limit == "MAX" || psv->limit == "max" ) {
target_state = TRIP_PT_INVALID_TARGET_STATE;
- } else if (psv->limit == "MIN") {
+ } else if (psv->limit == "MIN" || psv->limit == "min") {
target_state = 0;
} else {
std::istringstream buffer(psv->limit);

View File

@ -8,7 +8,7 @@
Name: thermald
Version: 2.4.1
Release: 1%{?dist}
Release: 3%{?dist}
Summary: Thermal Management daemon
License: GPLv2+
@ -18,6 +18,7 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
# No cpuid.h on other arches.
ExclusiveArch: %{ix86} x86_64
BuildRequires: make
BuildRequires: autoconf autoconf-archive
BuildRequires: automake
BuildRequires: dbus-glib-devel
@ -36,6 +37,8 @@ Requires(pre): shadow-utils
%{?systemd_requires}
Patch01: issue_291.diff
%description
%{name} monitors and controls platform temperature.
@ -242,6 +245,12 @@ exit 0
%changelog
* Tue Feb 02 2021 Benjamin Berg <bberg@redhat.com> - 2.4.1-3
- Add upstream patch fixing parsing of passive targets
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Dec 01 2020 Benjamin Berg <bberg@redhat.com> - 2.4.1-1
- New upstream release (#1903094)