From f4e97a1b618fda5a46df3980ceead5db83a94de3 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 1 Aug 2019 07:39:38 +0800 Subject: thermald: upgrade 1.8 -> 1.9 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 --- ...1-Use-correct-format-specifier-for-size_t.patch | 52 +++++++++++++--------- recipes-bsp/thermald/thermald_1.8.bb | 35 --------------- recipes-bsp/thermald/thermald_1.9.bb | 35 +++++++++++++++ 3 files changed, 65 insertions(+), 57 deletions(-) delete mode 100644 recipes-bsp/thermald/thermald_1.8.bb create mode 100644 recipes-bsp/thermald/thermald_1.9.bb (limited to 'recipes-bsp') diff --git a/recipes-bsp/thermald/thermald/0001-Use-correct-format-specifier-for-size_t.patch b/recipes-bsp/thermald/thermald/0001-Use-correct-format-specifier-for-size_t.patch index 6897ffc1..eaa0da61 100644 --- a/recipes-bsp/thermald/thermald/0001-Use-correct-format-specifier-for-size_t.patch +++ b/recipes-bsp/thermald/thermald/0001-Use-correct-format-specifier-for-size_t.patch @@ -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 -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 %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::size_type' {aka 'unsigned int'} [-Werror=format=] -| thd_log_debug("sort_and_update_poll_trip: trip_points_size =%lu\n", -| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -| trip_points.size()); - -Upstream-Status: Submitted -[https://github.com/intel/thermal_daemon/pull/165] +| In file included from ../git/src/thd_common.h:27, +| from ../git/src/thd_zone.h:30, +| 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&)': +| ../git/src/thd_zone.cpp:322:16: error: format '%lu' expects argument of type 'long unsigned int', but argument 4 has type 'std::vector::size_type' {aka 'unsigned int'} [-Werror=format=] +| 322 | thd_log_info("trip_points.size():%lu\n", trip_points.size()); +| | ^~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~ +| | | +| | std::vector::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 --- 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 +index dd485d9..eb81d61 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()); +@@ -319,7 +319,7 @@ void cthd_zone::add_trip(cthd_trip_point &trip) { + void cthd_zone::update_highest_trip_temp(cthd_trip_point &trip) + { if (trip_points.size()) { - unsigned int polling_trip = 0; --- -2.17.1 - +- thd_log_info("trip_points.size():%lu\n", trip_points.size()); ++ thd_log_info("trip_points.size():%zu\n", trip_points.size()); + 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"); diff --git a/recipes-bsp/thermald/thermald_1.8.bb b/recipes-bsp/thermald/thermald_1.8.bb deleted file mode 100644 index f7725f31..00000000 --- a/recipes-bsp/thermald/thermald_1.8.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Linux thermal daemon" - -DESCRIPTION = "Thermal Daemon is a Linux daemon used to prevent the \ -overheating of platforms. This daemon monitors temperature and applies \ -compensation using available cooling methods." - -HOMEPAGE = "https://github.com/01org/thermal_daemon" - -DEPENDS = "dbus dbus-glib dbus-glib-native libxml2 glib-2.0 glib-2.0-native" -DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" -DEPENDS_append_libc-musl = " argp-standalone" -DEPENDS_append_toolchain-clang = " openmp" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848" - -SRC_URI = "git://github.com/intel/thermal_daemon/ \ - file://0001-Use-correct-format-specifier-for-size_t.patch \ - " -SRCREV = "517c0e5f92d49aeeef3a22b04caf40d588216827" -S = "${WORKDIR}/git" - -inherit pkgconfig autotools systemd - -FILES_${PN} += "${datadir}/dbus-1/system-services/*.service" - -SYSTEMD_SERVICE_${PN} = "thermald.service" - -COMPATIBLE_HOST = '(i.86|x86_64).*-linux' - -CONFFILES_${PN} = " \ - ${sysconfdir}/thermald/thermal-conf.xml \ - ${sysconfdir}/thermald/thermal-cpu-cdev-order.xml \ - " - -UPSTREAM_CHECK_URI = "https://github.com/01org/thermal_daemon/releases" diff --git a/recipes-bsp/thermald/thermald_1.9.bb b/recipes-bsp/thermald/thermald_1.9.bb new file mode 100644 index 00000000..4f3650fa --- /dev/null +++ b/recipes-bsp/thermald/thermald_1.9.bb @@ -0,0 +1,35 @@ +SUMMARY = "Linux thermal daemon" + +DESCRIPTION = "Thermal Daemon is a Linux daemon used to prevent the \ +overheating of platforms. This daemon monitors temperature and applies \ +compensation using available cooling methods." + +HOMEPAGE = "https://github.com/01org/thermal_daemon" + +DEPENDS = "dbus dbus-glib dbus-glib-native libxml2 glib-2.0 glib-2.0-native" +DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" +DEPENDS_append_libc-musl = " argp-standalone" +DEPENDS_append_toolchain-clang = " openmp" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848" + +SRC_URI = "git://github.com/intel/thermal_daemon/ \ + file://0001-Use-correct-format-specifier-for-size_t.patch \ + " +SRCREV = "7f573b681a25b5ffbe81103ba9fdcf7fec0f2884" +S = "${WORKDIR}/git" + +inherit pkgconfig autotools systemd + +FILES_${PN} += "${datadir}/dbus-1/system-services/*.service" + +SYSTEMD_SERVICE_${PN} = "thermald.service" + +COMPATIBLE_HOST = '(i.86|x86_64).*-linux' + +CONFFILES_${PN} = " \ + ${sysconfdir}/thermald/thermal-conf.xml \ + ${sysconfdir}/thermald/thermal-cpu-cdev-order.xml \ + " + +UPSTREAM_CHECK_URI = "https://github.com/01org/thermal_daemon/releases" -- cgit v1.2.3-54-g00ecf