openmp is not required by thermald so remove the dependency. Also remove the DEPENDS on systemd and pass the systemd unit directory path.
Signed-off-by: Anuj Mittal <[email protected]> --- .../0001-configure.ac-disable-werror.patch | 27 ++++++++++ ...ix-32-bit-build-error-with-musl-v1.2.patch | 51 ------------------- .../{thermald_1.9.1.bb => thermald_2.2.bb} | 11 ++-- 3 files changed, 33 insertions(+), 56 deletions(-) create mode 100644 recipes-bsp/thermald/thermald/0001-configure.ac-disable-werror.patch delete mode 100644 recipes-bsp/thermald/thermald/0001-thd_trip_point-fix-32-bit-build-error-with-musl-v1.2.patch rename recipes-bsp/thermald/{thermald_1.9.1.bb => thermald_2.2.bb} (76%) diff --git a/recipes-bsp/thermald/thermald/0001-configure.ac-disable-werror.patch b/recipes-bsp/thermald/thermald/0001-configure.ac-disable-werror.patch new file mode 100644 index 00000000..b8639e0e --- /dev/null +++ b/recipes-bsp/thermald/thermald/0001-configure.ac-disable-werror.patch @@ -0,0 +1,27 @@ +From b20692607ec8b0895c5ac0c23b0393ad3048640d Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <[email protected]> +Date: Mon, 22 Jun 2020 09:34:51 +0800 +Subject: [PATCH] configure.ac: disable werror + +Upstream-Status: Inappropriate + +Signed-off-by: Anuj Mittal <[email protected]> +--- + configure.ac | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 7d6c13c..3e1a8bf 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -84,7 +84,6 @@ for flag in \ + -Wall \ + -Wclobbered \ + -Wempty-body \ +- -Werror \ + -Wformat \ + -Wignored-qualifiers \ + -Wmissing-field-initializers \ +-- +2.25.4 + diff --git a/recipes-bsp/thermald/thermald/0001-thd_trip_point-fix-32-bit-build-error-with-musl-v1.2.patch b/recipes-bsp/thermald/thermald/0001-thd_trip_point-fix-32-bit-build-error-with-musl-v1.2.patch deleted file mode 100644 index ee3c5e5e..00000000 --- a/recipes-bsp/thermald/thermald/0001-thd_trip_point-fix-32-bit-build-error-with-musl-v1.2.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 2145c92fb2ee6d1b03b9ea92e0f910e60b925d70 Mon Sep 17 00:00:00 2001 -From: Naveen Saini <[email protected]> -Date: Thu, 5 Mar 2020 13:45:57 +0800 -Subject: [PATCH] thd_trip_point: fix 32-bit build error with musl v1.2.0 - -Error log: - ../git/src/thd_trip_point.cpp: In member function 'bool cthd_trip_point::thd_trip_point_check(int, unsigned int, int, bool*)': -| ../git/src/thd_trip_point.cpp:250:19: error: format '%ld' expects argument of type 'long int', but argument 6 has type 'time_t' {aka 'long long int'} [-Werror=format=] -| 250 | thd_log_info("Too early to act zone:%d index %d tm %ld\n", - -musl 1.2.0 have new feature: -time_t is now 64-bit on all archs (not just 64-bit archs) - -Commit id: -https://git.musl-libc.org/cgit/musl/commit/?id=38143339646a4ccce8afe298c34467767c899f51 - -Release note link for musl 1.2.0: -https://git.musl-libc.org/cgit/musl/diff/ - -Upstream-Status: Submitted [https://github.com/intel/thermal_daemon/pull/217] - -Signed-off-by: Naveen Saini <[email protected]> ---- - src/thd_trip_point.cpp | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) - -diff --git a/src/thd_trip_point.cpp b/src/thd_trip_point.cpp -index 043be0c..2186ac2 100644 ---- a/src/thd_trip_point.cpp -+++ b/src/thd_trip_point.cpp -@@ -242,15 +242,9 @@ bool cthd_trip_point::thd_trip_point_check(int id, unsigned int read_temp, - time_t tm; - time(&tm); - if ((tm - cdevs[i].last_op_time) < cdevs[i].sampling_priod) { --#if defined __x86_64__ && defined __ILP32__ -- thd_log_info("Too early to act zone:%d index %d tm %lld\n", -+ thd_log_info("Too early to act zone:%d index %d tm %jd\n", - zone_id, cdev->thd_cdev_get_index(), -- tm - cdevs[i].last_op_time); --#else -- thd_log_info("Too early to act zone:%d index %d tm %ld\n", -- zone_id, cdev->thd_cdev_get_index(), -- tm - cdevs[i].last_op_time); --#endif -+ (intmax_t)tm - cdevs[i].last_op_time); - break; - } - cdevs[i].last_op_time = tm; --- -2.17.1 - diff --git a/recipes-bsp/thermald/thermald_1.9.1.bb b/recipes-bsp/thermald/thermald_2.2.bb similarity index 76% rename from recipes-bsp/thermald/thermald_1.9.1.bb rename to recipes-bsp/thermald/thermald_2.2.bb index be68aa48..6da1291d 100644 --- a/recipes-bsp/thermald/thermald_1.9.1.bb +++ b/recipes-bsp/thermald/thermald_2.2.bb @@ -7,20 +7,21 @@ 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-thd_trip_point-fix-32-bit-build-error-with-musl-v1.2.patch \ + file://0001-configure.ac-disable-werror.patch \ " -SRCREV = "7e23f7cc4611fd7289014c9805749ec75d59bae0" +SRCREV = "4f0e68974c26749191ac945586b8cc97800d5d02" S = "${WORKDIR}/git" inherit pkgconfig autotools systemd +EXTRA_OECONF = " \ + --with-systemdsystemunitdir=${systemd_system_unitdir} \ + " + FILES_${PN} += "${datadir}/dbus-1/system-services/*.service" SYSTEMD_SERVICE_${PN} = "thermald.service" -- 2.25.4
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6604): https://lists.yoctoproject.org/g/meta-intel/message/6604 Mute This Topic: https://lists.yoctoproject.org/mt/75031633/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
