import thermald-2.5-3.el8

This commit is contained in:
CentOS Sources 2022-11-08 01:49:14 -05:00 committed by Stepan Oksanichenko
parent 7017459488
commit eebe12f93d
6 changed files with 37694 additions and 99 deletions

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/thermald-2.4.6.tar.gz
SOURCES/thermald-2.5.tar.gz

View File

@ -1 +1 @@
1b5f2aab3b231ebcae292813424f4a54561caa12 SOURCES/thermald-2.4.6.tar.gz
24d6d30a68a9c313800dcdc45b3da2b2431b1a3b SOURCES/thermald-2.5.tar.gz

View File

@ -1,93 +0,0 @@
From d28613aea8179c068cfab853f5aa2a0c2b7adebf Mon Sep 17 00:00:00 2001
From: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Date: Thu, 19 Aug 2021 21:29:12 -0700
Subject: [PATCH 1/3] Added Jasper Lake CPU model
Support Jasper Lake.
---
src/thd_engine.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/thd_engine.cpp b/src/thd_engine.cpp
index e23f483..59c7659 100644
--- a/src/thd_engine.cpp
+++ b/src/thd_engine.cpp
@@ -697,6 +697,7 @@ static supported_ids_t id_table[] = {
{ 6, 0xa5 }, // Cometlake
{ 6, 0xa6 }, // Cometlake_L
{ 6, 0xa7 }, // Rocketlake
+ { 6, 0x9c }, // Jasper Lake
{ 0, 0 } // Last Invalid entry
};
--
2.31.1
From ffb226c62d3bc052f47970be9802254e48799bf4 Mon Sep 17 00:00:00 2001
From: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Date: Mon, 14 Jun 2021 10:12:38 -0700
Subject: [PATCH 2/3] Add AlderLake cpu model
Added AlderLake CPU models.
---
src/thd_engine.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/thd_engine.cpp b/src/thd_engine.cpp
index 59c7659..0202de5 100644
--- a/src/thd_engine.cpp
+++ b/src/thd_engine.cpp
@@ -698,6 +698,8 @@ static supported_ids_t id_table[] = {
{ 6, 0xa6 }, // Cometlake_L
{ 6, 0xa7 }, // Rocketlake
{ 6, 0x9c }, // Jasper Lake
+ { 6, 0x97 }, // Alderlake
+ { 6, 0x9a }, // Alderlake
{ 0, 0 } // Last Invalid entry
};
--
2.31.1
From d0c9e7fb5aea85b84841eba927feb8767765fda2 Mon Sep 17 00:00:00 2001
From: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Date: Tue, 22 Jun 2021 08:44:44 -0700
Subject: [PATCH 3/3] Update sysfs paths for Alader Lake
Update sysfs path for INT3400 device.
---
src/thd_engine_adaptive.cpp | 2 ++
src/thd_int3400.cpp | 2 ++
2 files changed, 4 insertions(+)
diff --git a/src/thd_engine_adaptive.cpp b/src/thd_engine_adaptive.cpp
index 20df937..247ca6c 100644
--- a/src/thd_engine_adaptive.cpp
+++ b/src/thd_engine_adaptive.cpp
@@ -1583,6 +1583,8 @@ int cthd_engine_adaptive::thd_engine_start(bool ignore_cpuid_check) {
int3400_base_path = "/sys/bus/platform/devices/INT3400:00/";
} else if (sysfs.exists("/sys/bus/platform/devices/INTC1040:00")) {
int3400_base_path = "/sys/bus/platform/devices/INTC1040:00/";
+ } else if (sysfs.exists("/sys/bus/platform/devices/INTC1041:00")) {
+ int3400_base_path = "/sys/bus/platform/devices/INTC1041:00/";
} else {
return THD_ERROR;
}
diff --git a/src/thd_int3400.cpp b/src/thd_int3400.cpp
index 4fabaee..a89f002 100644
--- a/src/thd_int3400.cpp
+++ b/src/thd_int3400.cpp
@@ -36,6 +36,8 @@ cthd_INT3400::cthd_INT3400(std::string _uuid) : uuid(_uuid), base_path("") {
base_path = "/sys/bus/acpi/devices/INT3400:00/physical_node/uuids/";
} else if (cdev_sysfs.exists("/sys/bus/acpi/devices/INTC1040:00/physical_node/uuids")) {
base_path = "/sys/bus/acpi/devices/INTC1040:00/physical_node/uuids/";
+ } else if (cdev_sysfs.exists("/sys/bus/acpi/devices/INTC1041:00/physical_node/uuids")) {
+ base_path = "/sys/bus/acpi/devices/INTC1041:00/physical_node/uuids/";
}
thd_log_info("INT3400 Base path is %s\n", base_path.c_str());
}
--
2.31.1

View File

@ -0,0 +1,15 @@
diff --git a/src/main.cpp b/src/main.cpp
index 6e2f5e4..b4b9317 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -51,6 +51,10 @@
#define TD_DIST_VERSION PACKAGE_VERSION
#endif
+#ifndef G_SOURCE_FUNC
+#define G_SOURCE_FUNC(f) ((GSourceFunc) (void (*)(void)) (f))
+#endif
+
#define EXIT_UNSUPPORTED 2
extern int thd_dbus_server_init(gboolean (*exit_handler)(void));

37658
SOURCES/qcustomplot.patch Normal file

File diff suppressed because it is too large Load Diff

View File

@ -7,8 +7,8 @@
Name: thermald
Version: 2.4.6
Release: 1%{?dist}
Version: 2.5
Release: 3%{?dist}
Summary: Thermal Management daemon
License: GPLv2+
@ -36,8 +36,11 @@ Requires(pre): shadow-utils
%{?systemd_requires}
# Alderlake and Jasperlake support have not been released yet
Patch0001: alderlake-jasperlake-upstream.patch
# Upstream removed the internal copy of qcustomplot, add it back as we don't have it in RHEL.
# The alternative would be removing the GUI package
Patch9000: qcustomplot.patch
# G_SOURCE_FUNC only exists with GLib >= 2.58
Patch9001: g-source-func.patch
%description
%{name} monitors and controls platform temperature.
@ -245,6 +248,18 @@ exit 0
%changelog
* Mon Jul 25 2022 Benjamin Berg <bberg@redhat.com> - 2.5-3
- Accept 2.5 as package version
Related: #2040080
* Mon Jul 25 2022 Benjamin Berg <bberg@redhat.com> - 2.5-2
- Fix version test script
Related: #2040080
* Fri Jul 22 2022 Benjamin Berg <bberg@redhat.com> - 2.5-1
- Update to 2.5
Resolves: #2040080
* Fri Nov 12 2021 Benjamin Berg <bberg@redhat.com> - 2.4.6-1
- Update to 2.4.6 and newer CPU model support
Resolves: #1999368