From 8ecf604af20dda1312af5925dc942b3e43c42441 Mon Sep 17 00:00:00 2001 From: Yogesh Tyagi Date: Mon, 11 Mar 2024 03:18:56 -0700 Subject: thermald : upgrade 2.5.4 -> 2.5.6 Create a separate variable for branch value and derive the value from PV so AUH is able to upgrade the recipe. Release Notes: https://github.com/intel/thermal_daemon/releases/tag/v2.5.6 Signed-off-by: Yogesh Tyagi Signed-off-by: Anuj Mittal --- .../files/0001-Makefile-Fix-build-Issue.patch | 39 +++++++++++++++++++ .../recipes-bsp/thermald/thermald_2.5.4.bb | 44 --------------------- .../recipes-bsp/thermald/thermald_2.5.6.bb | 45 ++++++++++++++++++++++ 3 files changed, 84 insertions(+), 44 deletions(-) create mode 100644 dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.4.bb create mode 100644 dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.6.bb diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch new file mode 100644 index 00000000..270cc84d --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch @@ -0,0 +1,39 @@ +From c4c049481d48f33319b1d04cad56d622c4eed65f Mon Sep 17 00:00:00 2001 +From: Yogesh Tyagi +Date: Mon, 11 Mar 2024 13:13:32 +0800 +Subject: [PATCH] Makefile: Fix build Issue +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In case build directory is different from source, make sure make is able to find the correct input files. + +Fixes: +| dbus-binding-tool --prefix=thd_dbus_interface --mode=glib-server --output=thd_dbus_interface.h ../git/src/thd_dbus_interface.xml +| glib-compile-resources --generate-source thermald-resource.gresource.xml +| Failed to open file “thermald-resource.gresource.xml”: No such file or directory + + +Upstream-Status: Submitted +https://github.com/intel/thermal_daemon/pull/436 + +Signed-off-by: Yogesh Tyagi +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index a0c051a..772e280 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -95,6 +95,6 @@ thd_dbus_interface.h: $(top_srcdir)/src/thd_dbus_interface.xml + $(AM_V_GEN) dbus-binding-tool --prefix=thd_dbus_interface --mode=glib-server --output=$@ $< + + thermald-resource.c: $(top_srcdir)/thermald-resource.gresource.xml +- $(AM_V_GEN) glib-compile-resources --generate-source thermald-resource.gresource.xml ++ $(AM_V_GEN) glib-compile-resources --generate-source --sourcedir=${top_srcdir} $< + + CLEANFILES = $(BUILT_SOURCES) +-- +2.34.1 + diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.4.bb b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.4.bb deleted file mode 100644 index ad66d843..00000000 --- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.4.bb +++ /dev/null @@ -1,44 +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 upower libevdev" -DEPENDS += "autoconf-archive-native" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848" - -SRC_URI = "git://github.com/intel/thermal_daemon/;branch=master;protocol=https \ - " - -SRCREV = "63b290f20da115f62f5bbd39a28fa5afe0f6efc2" -S = "${WORKDIR}/git" - -inherit pkgconfig autotools systemd gtk-doc - -# gtkdocsize runs before autotools do_configure and it copies gtk-doc.m4 and fails -# to copy becuase there is no m4 dir yet. -do_configure:prepend () { - mkdir -p ${S}/m4 -} - -EXTRA_OECONF = " \ - --with-systemdsystemunitdir=${systemd_system_unitdir} \ - " - -FILES:${PN} += "${datadir}/dbus-1" - -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/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.6.bb b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.6.bb new file mode 100644 index 00000000..df242cdf --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.6.bb @@ -0,0 +1,45 @@ +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 upower libevdev" +DEPENDS += "autoconf-archive-native" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848" + +SRC_URI = "git://github.com/intel/thermal_daemon/;branch=master;protocol=https \ + file://0001-Makefile-Fix-build-Issue.patch \ + " + +SRCREV = "3990ce2391e5c07293758c056e09e4f2453691b4" +S = "${WORKDIR}/git" + +inherit pkgconfig autotools systemd gtk-doc + +# gtkdocsize runs before autotools do_configure and it copies gtk-doc.m4 and fails +# to copy becuase there is no m4 dir yet. +do_configure:prepend () { + mkdir -p ${S}/m4 +} + +EXTRA_OECONF = " \ + --with-systemdsystemunitdir=${systemd_system_unitdir} \ + " + +FILES:${PN} += "${datadir}/dbus-1" + +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