MIRRORS/meta-intel
1
0
Fork 0
mirror of git://git.yoctoproject.org/meta-intel.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

thermald: upgrade 1.8 -> 1.9

Browse Source 
Changes:
https://github.com/intel/thermal_daemon/blob/master/README.txt

Also remove the local patch that has been merged upstream and replace it
with another fix for a similar problem elsewhere.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Anuj Mittal 2019-08-01 07:39:38 +08:00
parent 03f2176249
commit f4e97a1b61
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
recipes-bsp/thermald/thermald/0001-Use-correct-format-specifier-for-size_t.patch
View File

@ -1,37 +1,45 @@
From bb7631163c8f3f44d0dc83690765cdb799664fd5 Mon Sep 17 00:00:00 2001 From dcdaf523393a6e7c07b5a510c573223722b0289b Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com> From: Anuj Mittal <anuj.mittal@intel.com>
Date: Wed, 26 Sep 2018 10:34:15 +0800 Date: Thu, 1 Aug 2019 08:15:52 +0800
Subject: [PATCH] Use correct format specifier for size_t Subject: [PATCH] Use correct format specifier for size_t
%zu instead of %lu, otherwise on 32 bit: %zu instead of %lu, otherwise on 32 bit:
| ../git/src/thd_zone.cpp: In member function 'void cthd_zone::sort_and_update_poll_trip()': | In file included from ../git/src/thd_common.h:27,
| ../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=] | from ../git/src/thd_zone.h:30,
| thd_log_debug("sort_and_update_poll_trip: trip_points_size =%lu\n", | from ../git/src/thd_zone.cpp:34:
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ../git/src/thd_zone.cpp: In member function 'void cthd_zone::update_highest_trip_temp(cthd_trip_point&)':
| trip_points.size()); | ../git/src/thd_zone.cpp:322: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=]
| 322 | thd_log_info("trip_points.size():%lu\n", trip_points.size());
Upstream-Status: Submitted | | ^~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~
[https://github.com/intel/thermal_daemon/pull/165] | | |
| | std::vector<cthd_trip_point>::size_type {aka unsigned int}
| ../git/src/thermald.h:82:57: note: in definition of macro 'thd_log_info'
| 82 | #define thd_log_info(...) g_log(NULL, G_LOG_LEVEL_INFO, __VA_ARGS__)
| | ^~~~~~~~~~~
| ../git/src/thd_zone.cpp:322:38: note: format string is defined here
| 322 | thd_log_info("trip_points.size():%lu\n", trip_points.size());
| | ~~^
| | |
| | long unsigned int
| | %u
Upstream-Status: Submitted [https://github.com/intel/thermal_daemon/pull/198]
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
--- ---
src/thd_zone.cpp | 2 +- src/thd_zone.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/thd_zone.cpp b/src/thd_zone.cpp diff --git a/src/thd_zone.cpp b/src/thd_zone.cpp
index b7edf9e..cb7b8e8 100644 index dd485d9..eb81d61 100644
--- a/src/thd_zone.cpp --- a/src/thd_zone.cpp
+++ b/src/thd_zone.cpp +++ b/src/thd_zone.cpp
@@ -103,7 +103,7 @@ int cthd_zone::read_user_set_psv_temp() { @@ -319,7 +319,7 @@ void cthd_zone::add_trip(cthd_trip_point &trip) {
} void cthd_zone::update_highest_trip_temp(cthd_trip_point &trip)
{
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()) { if (trip_points.size()) {
unsigned int polling_trip = 0; - thd_log_info("trip_points.size():%lu\n", trip_points.size());
-- + thd_log_info("trip_points.size():%zu\n", trip_points.size());
2.17.1 for (unsigned int j = trip_points.size() - 1;; --j) {
if (trip_points[j].get_trip_type() == trip.get_trip_type()) {
thd_log_info("updating existing trip temp \n");

2
recipes-bsp/thermald/thermald_1.8.bb → recipes-bsp/thermald/thermald_1.9.bb
View File

@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848"
SRC_URI = "git://github.com/intel/thermal_daemon/ \ SRC_URI = "git://github.com/intel/thermal_daemon/ \
file://0001-Use-correct-format-specifier-for-size_t.patch \ file://0001-Use-correct-format-specifier-for-size_t.patch \
" "
SRCREV = "517c0e5f92d49aeeef3a22b04caf40d588216827" SRCREV = "7f573b681a25b5ffbe81103ba9fdcf7fec0f2884"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"
inherit pkgconfig autotools systemd inherit pkgconfig autotools systemd