* [gentoo-commits] repo/gentoo:master commit in: sys-power/thermald/, sys-power/thermald/files/
@ 2018-11-07 18:20 Rick Farina
0 siblings, 0 replies; 2+ messages in thread
From: Rick Farina @ 2018-11-07 18:20 UTC (permalink / raw
To: gentoo-commits
commit: 8936b8d10e3758ed4142e6b0a1834cf7a560293f
Author: Zero_Chaos <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 7 18:20:40 2018 +0000
Commit: Rick Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Wed Nov 7 18:20:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8936b8d1
sys-power/thermald: fixes bug #670624
apologies if the bump isn't correct, but I wasn't sure if this might
cause a runtime issue on other arches which successfully built and the
package takes 20 seconds to build
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Rick Farina <zerochaos <AT> gentoo.org>
.../thermald/files/thermald-1.8-x86-fix.patch | 31 ++++++++++++++++++++++
...{thermald-1.8.ebuild => thermald-1.8-r1.ebuild} | 1 +
2 files changed, 32 insertions(+)
diff --git a/sys-power/thermald/files/thermald-1.8-x86-fix.patch b/sys-power/thermald/files/thermald-1.8-x86-fix.patch
new file mode 100644
index 00000000000..e944003b79b
--- /dev/null
+++ b/sys-power/thermald/files/thermald-1.8-x86-fix.patch
@@ -0,0 +1,31 @@
+From bb7631163c8f3f44d0dc83690765cdb799664fd5 Mon Sep 17 00:00:00 2001
+From: Anuj Mittal <anuj.mittal@intel.com>
+Date: Wed, 26 Sep 2018 10:34:15 +0800
+Subject: [PATCH] Use correct format specifier for size_t
+
+%zu instead of %lu, otherwise on 32 bit:
+
+| ../git/src/thd_zone.cpp: In member function 'void cthd_zone::sort_and_update_poll_trip()':
+| ../git/src/thd_zone.cpp:106:16: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'std::vector<cthd_trip_point>::size_type' {aka 'unsigned int'} [-Werror=format=]
+| thd_log_debug("sort_and_update_poll_trip: trip_points_size =%lu\n",
+| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+| trip_points.size());
+
+Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
+---
+ src/thd_zone.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/thd_zone.cpp b/src/thd_zone.cpp
+index b7edf9e..cb7b8e8 100644
+--- a/src/thd_zone.cpp
++++ b/src/thd_zone.cpp
+@@ -103,7 +103,7 @@ int cthd_zone::read_user_set_psv_temp() {
+ }
+
+ void cthd_zone::sort_and_update_poll_trip() {
+- thd_log_debug("sort_and_update_poll_trip: trip_points_size =%lu\n",
++ thd_log_debug("sort_and_update_poll_trip: trip_points_size =%zu\n",
+ trip_points.size());
+ if (trip_points.size()) {
+ unsigned int polling_trip = 0;
diff --git a/sys-power/thermald/thermald-1.8.ebuild b/sys-power/thermald/thermald-1.8-r1.ebuild
similarity index 95%
rename from sys-power/thermald/thermald-1.8.ebuild
rename to sys-power/thermald/thermald-1.8-r1.ebuild
index 525bb27d6f0..e578d903b8e 100644
--- a/sys-power/thermald/thermald-1.8.ebuild
+++ b/sys-power/thermald/thermald-1.8-r1.ebuild
@@ -26,6 +26,7 @@ S=${WORKDIR}/thermal_daemon-${PV}
DOCS=( thermal_daemon_usage.txt README.txt )
src_prepare() {
+ epatch "${FILESDIR}"/"${P}"-x86-fix.patch
default
eautoreconf
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/thermald/, sys-power/thermald/files/
@ 2023-10-09 2:58 Yixun Lan
0 siblings, 0 replies; 2+ messages in thread
From: Yixun Lan @ 2023-10-09 2:58 UTC (permalink / raw
To: gentoo-commits
commit: d31101abffeb80f0de0e7141f5becbaa6ccc3e61
Author: Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 9 02:55:03 2023 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Mon Oct 9 02:57:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d31101ab
sys-power/thermald: fix ioctl for reading PSVT
Upstream-PR: https://github.com/intel/thermal_daemon/pull/422
Signed-off-by: Yixun Lan <dlan <AT> gentoo.org>
.../thermald/files/thermald-2.5.4-ioctl.patch | 25 ++++++++++
sys-power/thermald/thermald-2.5.4-r1.ebuild | 56 ++++++++++++++++++++++
2 files changed, 81 insertions(+)
diff --git a/sys-power/thermald/files/thermald-2.5.4-ioctl.patch b/sys-power/thermald/files/thermald-2.5.4-ioctl.patch
new file mode 100644
index 000000000000..85a4a82218aa
--- /dev/null
+++ b/sys-power/thermald/files/thermald-2.5.4-ioctl.patch
@@ -0,0 +1,25 @@
+diff --git a/src/acpi_thermal_rel_ioct.h b/src/acpi_thermal_rel_ioct.h
+index dd045a9..9b12a69 100644
+--- a/src/acpi_thermal_rel_ioct.h
++++ b/src/acpi_thermal_rel_ioct.h
+@@ -34,17 +34,14 @@
+ #define ACPI_THERMAL_GET_ART _IOR(ACPI_THERMAL_MAGIC, 6, unsigned long)
+
+ /*
+- * ACPI_THERMAL_GET_PSVT_REV = Revision number
+- * identifies limit type: 1=true proportional limit, 2=depth limit
+ * ACPI_THERMAL_GET_PSVT_COUNT = Number of PSVT entries
+ * ACPI_THERMAL_GET_PSVT_LEN = Total return data size (PSVT count x each
+ * PSVT entry size)
+ * ACPI_THERMAL_GET_PSVT = Get the data as an array of psvt_objects
+ */
+-#define ACPI_THERMAL_GET_PSVT_REV _IOR(ACPI_THERMAL_MAGIC, 7, unsigned long)
+-#define ACPI_THERMAL_GET_PSVT_LEN _IOR(ACPI_THERMAL_MAGIC, 8, unsigned long)
+-#define ACPI_THERMAL_GET_PSVT_COUNT _IOR(ACPI_THERMAL_MAGIC, 9, unsigned long)
+-#define ACPI_THERMAL_GET_PSVT _IOR(ACPI_THERMAL_MAGIC, 10, unsigned long)
++#define ACPI_THERMAL_GET_PSVT_LEN _IOR(ACPI_THERMAL_MAGIC, 7, unsigned long)
++#define ACPI_THERMAL_GET_PSVT_COUNT _IOR(ACPI_THERMAL_MAGIC, 8, unsigned long)
++#define ACPI_THERMAL_GET_PSVT _IOR(ACPI_THERMAL_MAGIC, 9, unsigned long)
+
+ #ifndef __KERNEL__
+ #define u64 unsigned long long
diff --git a/sys-power/thermald/thermald-2.5.4-r1.ebuild b/sys-power/thermald/thermald-2.5.4-r1.ebuild
new file mode 100644
index 000000000000..d9b0e929bcb5
--- /dev/null
+++ b/sys-power/thermald/thermald-2.5.4-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools linux-info out-of-source systemd
+
+DESCRIPTION="Thermal daemon for Intel architectures"
+HOMEPAGE="https://github.com/intel/thermal_daemon"
+SRC_URI="https://github.com/intel/thermal_daemon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+ dev-libs/dbus-glib:=
+ dev-libs/glib:=
+ dev-libs/libxml2:=
+ dev-libs/libevdev
+ sys-power/upower
+ sys-apps/dbus:="
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc
+ dev-util/glib-utils"
+
+S=${WORKDIR}/thermal_daemon-${PV}
+DOCS=( thermal_daemon_usage.txt README.txt )
+
+CONFIG_CHECK="~PERF_EVENTS_INTEL_RAPL ~X86_INTEL_PSTATE ~INTEL_POWERCLAMP ~INT340X_THERMAL ~ACPI_THERMAL_REL ~INT3406_THERMAL"
+
+PATCHES=( "${FILESDIR}/${P}-ioctl.patch" )
+
+src_prepare() {
+ sed -i -e '/tdrundir/s@\$localstatedir/run@\$runstatedir@' \
+ configure.ac || die
+
+ default
+ eautoreconf
+}
+
+my_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ --disable-werror \
+ --runstatedir="${EPREFIX}"/run \
+ --with-dbus-power-group=wheel \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+}
+
+my_src_install_all() {
+ einstalldocs
+
+ rm -rf "${ED}"/etc/init || die
+ doinitd "${FILESDIR}"/thermald
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-10-09 2:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-10-09 2:58 [gentoo-commits] repo/gentoo:master commit in: sys-power/thermald/, sys-power/thermald/files/ Yixun Lan
-- strict thread matches above, loose matches on Subject: below --
2018-11-07 18:20 Rick Farina
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox