5 files changed, 79 insertions, 45 deletions

diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/0001-LMS-fix-build-issue-with-gcc-15.patch b/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/0001-LMS-fix-build-issue-with-gcc-15.patch
new file mode 100644
index 00000000..751c7973
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/0001-LMS-fix-build-issue-with-gcc-15.patch
@@ -0,0 +1,32 @@
+From 439af27f7641185933d7810b6c4eb17086438df3 Mon Sep 17 00:00:00 2001
+From: Yogesh Tyagi <yogesh.tyagi@intel.com>
+Date: Mon, 19 May 2025 17:50:40 +0530
+Subject: [PATCH] LMS : fix build issue with gcc 15
+
+include cstdint header to resolve the below error with gcc 15
+
+| In file included from /lms/2406.0.0.0/git/MEIClient/src/MEICommand.cpp:11:
+| /lms/2406.0.0.0/git/MEIClient/Include/MEICommand.h:40:54: error: 'uint8_t' was not declared in this scope
+
+Upstream-Status: Submitted [https://github.com/intel/lms/pull/23]
+
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ MEIClient/Include/MEICommand.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/MEIClient/Include/MEICommand.h b/MEIClient/Include/MEICommand.h
+index 6192d26..5332e44 100644
+--- a/MEIClient/Include/MEICommand.h
++++ b/MEIClient/Include/MEICommand.h
+@@ -12,6 +12,7 @@
+ #define __MEI_COMMAND_H__
+ #include "heci.h"
+ #include "MEIClientException.h"
++#include <cstdint>
+ #include <memory>
+ #include <vector>
+ 
+-- 
+2.43.0
+
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch b/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch
new file mode 100644
index 00000000..34622d42
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch
@@ -0,0 +1,39 @@
+From e1f6129390706044112496b6f10baee5b604b4c8 Mon Sep 17 00:00:00 2001
+From: Yogesh Tyagi <yogesh.tyagi@intel.com>
+Date: Wed, 23 Jul 2025 23:48:41 +0800
+Subject: [PATCH] cmake: Bump required CMake version to 3.5 to allow builds
+ with CMake 4+
+
+This enables builds with CMake 4+, fixing:
+
+    CMake Error at CMakeLists.txt:1 (cmake_minimum_required):
+      Compatibility with CMake < 3.5 has been removed from CMake.
+
+      Update the VERSION argument <min> value.  Or, use the <min>...<max> syntax
+      to tell CMake that the project requires at least <min> but has been
+      updated to work with policies introduced by <max> or earlier.
+
+      Or, add -DCMAKE_POLICY_VERSION_MINIMUM=3.5 to try configuring anyway.
+
+Upstream-Status: Inappropriate
+
+Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
+---
+ CIM_Framework/openwsman/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CIM_Framework/openwsman/CMakeLists.txt b/CIM_Framework/openwsman/CMakeLists.txt
+index 6e54c66..e2ffa5f 100644
+--- a/CIM_Framework/openwsman/CMakeLists.txt
++++ b/CIM_Framework/openwsman/CMakeLists.txt
+@@ -6,7 +6,7 @@ PROJECT(openwsman)
+
+ # 2.6 minimum because of CMP0005 (escaping defines)
+ # 2.8.12 minimum because CMake 3.19.7 says so
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.5)
+
+ include(CTest)
+ enable_testing()
+--
+2.37.3
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb
index bdf32576..ae60df9e 100644
--- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb
@@ -19,15 +19,19 @@ PACKAGECONFIG ??= "connman"
 PACKAGECONFIG[connman]        = "-DNETWORK_CN=ON, -DNETWORK_CN=OFF, connman"
 PACKAGECONFIG[networkmanager] = "-DNETWORK_NM=ON, -DNETWORK_NM=OFF, networkmanager"
 
-REQUIRED_DISTRO_FEATURES= "systemd"
+REQUIRED_DISTRO_FEATURES = "systemd"
 
-FILES:${PN} += "${datadir}/dbus-1/system-services/*.service"
+EXTRA_OECMAKE += " \
+                  -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
+                  "
 
-S = "${WORKDIR}/git"
+FILES:${PN} += "${datadir}/dbus-1/system-services/*.service"
 
 SYSTEMD_SERVICE:${PN} = "lms.service"
 
 SRC_URI = "git://github.com/intel/lms.git;branch=master;protocol=https \
+           file://0001-LMS-fix-build-issue-with-gcc-15.patch \
+           file://0001-cmake-Bump-required-CMake-version-to-3.5-to-allow-bu.patch \
            "
 SRCREV = "388f115b2aeb3ea11499971c65f828daefd32c47"
 
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 270cc84d..00000000
--- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c4c049481d48f33319b1d04cad56d622c4eed65f Mon Sep 17 00:00:00 2001
-From: Yogesh Tyagi <yogesh.tyagi@intel.com>
-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 <yogesh.tyagi@intel.com>
----
- 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.6.bb b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.8.bb
index df242cdf..575a00e8 100644
--- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.6.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.8.bb
@@ -13,11 +13,9 @@ 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"
+SRCREV = "df3b9ab0ffe780c4fbad7750987eff76f659cfd5"
 
 inherit pkgconfig autotools systemd gtk-doc