Changes: https://github.com/intel/thermal_daemon/blob/master/README.txt
Also remove the local patch that has been merged upstream. Signed-off-by: Anuj Mittal <[email protected]> --- ...-correct-format-specifier-for-size_t.patch | 37 ------------------- .../{thermald_1.8.bb => thermald_1.9.bb} | 3 +- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 recipes-bsp/thermald/thermald/0001-Use-correct-format-specifier-for-size_t.patch rename recipes-bsp/thermald/{thermald_1.8.bb => thermald_1.9.bb} (90%) 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 6897ffc1..00000000 --- a/recipes-bsp/thermald/thermald/0001-Use-correct-format-specifier-for-size_t.patch +++ /dev/null @@ -1,37 +0,0 @@ -From bb7631163c8f3f44d0dc83690765cdb799664fd5 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <[email protected]> -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()); - -Upstream-Status: Submitted -[https://github.com/intel/thermal_daemon/pull/165] - -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 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; --- -2.17.1 - diff --git a/recipes-bsp/thermald/thermald_1.8.bb b/recipes-bsp/thermald/thermald_1.9.bb similarity index 90% rename from recipes-bsp/thermald/thermald_1.8.bb rename to recipes-bsp/thermald/thermald_1.9.bb index f7725f31..acaeae0c 100644 --- a/recipes-bsp/thermald/thermald_1.8.bb +++ b/recipes-bsp/thermald/thermald_1.9.bb @@ -14,9 +14,8 @@ 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" +SRCREV = "7f573b681a25b5ffbe81103ba9fdcf7fec0f2884" S = "${WORKDIR}/git" inherit pkgconfig autotools systemd -- 2.21.0 -- _______________________________________________ meta-intel mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-intel
