diff options
author | Yogesh Tyagi <yogesh.tyagi@intel.com> | 2024-10-22 15:07:27 +0530 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2024-10-22 20:09:41 +0800 |
commit | 42b6cfec173036e4e096871475e8928547371a71 (patch) | |
tree | 09c11988be38951e950bff97f2bed7abce431c3c | |
parent | da2013006ad5f75b2436060c0a9688b864f7fe07 (diff) | |
download | meta-intel-42b6cfec173036e4e096871475e8928547371a71.tar.gz |
thermald : upgrade 2.5.7 -> 2.5.8
Drop already merged patch 0001-Makefile-Fix-build-Issue.patch
Release Notes:
https://github.com/intel/thermal_daemon/releases/tag/v2.5.8
Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch | 35 | ||||
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.8.bb (renamed from dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.7.bb) | 3 |
2 files changed, 1 insertions, 37 deletions
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 deleted file mode 100644 index ea86bc31..00000000 --- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 1f6f4e29769adb9d49a3c4831dd2ba61f6ccbdce Mon Sep 17 00:00:00 2001 | ||
2 | From: Yogesh Tyagi <yogesh.tyagi@intel.com> | ||
3 | Date: Mon, 11 Mar 2024 13:13:32 +0800 | ||
4 | Subject: [PATCH] Makefile: Fix build Issue | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | In case build directory is different from source, make sure make is able to find the correct input files. | ||
10 | |||
11 | Fixes: | ||
12 | | dbus-binding-tool --prefix=thd_dbus_interface --mode=glib-server --output=thd_dbus_interface.h ../git/src/thd_dbus_interface.xml | ||
13 | | glib-compile-resources --generate-source thermald-resource.gresource.xml | ||
14 | | Failed to open file “thermald-resource.gresource.xml”: No such file or directory | ||
15 | |||
16 | Upstream-Status: Submitted | ||
17 | https://github.com/intel/thermal_daemon/pull/436 | ||
18 | |||
19 | Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com> | ||
20 | --- | ||
21 | Makefile.am | 2 +- | ||
22 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
23 | |||
24 | diff --git a/Makefile.am b/Makefile.am | ||
25 | index dd2ef10..cb19e17 100644 | ||
26 | --- a/Makefile.am | ||
27 | +++ b/Makefile.am | ||
28 | @@ -97,6 +97,6 @@ thd_dbus_interface.h: $(top_srcdir)/src/thd_dbus_interface.xml | ||
29 | $(AM_V_GEN) dbus-binding-tool --prefix=thd_dbus_interface --mode=glib-server --output=$@ $< | ||
30 | |||
31 | thermald-resource.c: $(top_srcdir)/thermald-resource.gresource.xml | ||
32 | - $(AM_V_GEN) glib-compile-resources --generate-source thermald-resource.gresource.xml | ||
33 | + $(AM_V_GEN) glib-compile-resources --generate-source --sourcedir=${top_srcdir} $< | ||
34 | |||
35 | CLEANFILES = $(BUILT_SOURCES) | ||
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.7.bb b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.8.bb index 66765e56..fee089de 100644 --- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.7.bb +++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.8.bb | |||
@@ -13,10 +13,9 @@ LICENSE = "GPL-2.0-only" | |||
13 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848" | 13 | LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848" |
14 | 14 | ||
15 | SRC_URI = "git://github.com/intel/thermal_daemon/;branch=master;protocol=https \ | 15 | SRC_URI = "git://github.com/intel/thermal_daemon/;branch=master;protocol=https \ |
16 | file://0001-Makefile-Fix-build-Issue.patch \ | ||
17 | " | 16 | " |
18 | 17 | ||
19 | SRCREV = "ea8b773f76641a7a49d6584669e17371c22ad03e" | 18 | SRCREV = "df3b9ab0ffe780c4fbad7750987eff76f659cfd5" |
20 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
21 | 20 | ||
22 | inherit pkgconfig autotools systemd gtk-doc | 21 | inherit pkgconfig autotools systemd gtk-doc |