* For changes in this version, see: https://github.com/intel/thermal_daemon/blob/v1.9.1/README.txt#L98
* Remove patch that has been merged upstream. Signed-off-by: Anuj Mittal <[email protected]> --- ...-correct-format-specifier-for-size_t.patch | 45 ------------------- .../{thermald_1.9.bb => thermald_1.9.1.bb} | 5 +-- 2 files changed, 2 insertions(+), 48 deletions(-) delete mode 100644 recipes-bsp/thermald/thermald/0001-Use-correct-format-specifier-for-size_t.patch rename recipes-bsp/thermald/{thermald_1.9.bb => thermald_1.9.1.bb} (86%) 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 deleted file mode 100644 index eaa0da61..00000000 --- a/recipes-bsp/thermald/thermald/0001-Use-correct-format-specifier-for-size_t.patch +++ /dev/null @@ -1,45 +0,0 @@ -From dcdaf523393a6e7c07b5a510c573223722b0289b Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <[email protected]> -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: - -| 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<cthd_trip_point>::size_type' {aka 'unsigned int'} [-Werror=format=] -| 322 | thd_log_info("trip_points.size():%lu\n", trip_points.size()); -| | ^~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~ -| | | -| | 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 <[email protected]> ---- - 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 dd485d9..eb81d61 100644 ---- a/src/thd_zone.cpp -+++ b/src/thd_zone.cpp -@@ -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()) { -- 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.9.bb b/recipes-bsp/thermald/thermald_1.9.1.bb similarity index 86% rename from recipes-bsp/thermald/thermald_1.9.bb rename to recipes-bsp/thermald/thermald_1.9.1.bb index 718e0d4c..e38e3f52 100644 --- a/recipes-bsp/thermald/thermald_1.9.bb +++ b/recipes-bsp/thermald/thermald_1.9.1.bb @@ -13,10 +13,9 @@ 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 \ +SRC_URI = "git://github.com/intel/thermal_daemon/ \ " -SRCREV = "7f573b681a25b5ffbe81103ba9fdcf7fec0f2884" +SRCREV = "7e23f7cc4611fd7289014c9805749ec75d59bae0" S = "${WORKDIR}/git" inherit pkgconfig autotools systemd -- 2.21.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6309): https://lists.yoctoproject.org/g/meta-intel/message/6309 Mute This Topic: https://lists.yoctoproject.org/mt/68794836/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
