3 files changed, 43 insertions, 13 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/lms_2226.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb
index e0d6b91e..0a5a57ed 100644
--- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2226.0.0.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb
@@ -10,30 +10,28 @@ COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
 COMPATIBLE_HOST:libc-musl = "null"
 
-inherit cmake systemd features_check
+inherit cmake systemd features_check python3native
 
-DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native pkgconfig-native"
-
-EXTRA_OECMAKE += "-DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3"
+DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native pkgconfig-native python3-packaging-native"
 
 # Enable either connman or networkmanager or none but not both.
 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"
 
-S = "${WORKDIR}/git"
-
 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 \
            "
-SRCREV = "7f4e295da5df69ae5424df18805af761c6601545"
+SRCREV = "388f115b2aeb3ea11499971c65f828daefd32c47"
 
 do_install:append() {
+    install -d ${D}${sysconfdir}/lms
     install -d ${D}${systemd_system_unitdir}
     install -m 0644 ${B}/UNS/lms.service ${D}${systemd_system_unitdir}
     install -d ${D}${sysconfdir}/udev/rules.d
@@ -42,5 +40,4 @@ do_install:append() {
 
 RDEPENDS:${PN} += "ace"
 
-# This CVE is for Lan Management System software and not this lms.
-CVE_CHECK_IGNORE += "CVE-2018-1000535"
+CVE_STATUS[CVE-2018-1000535] = "cpe-incorrect: This CVE is for a different LMS - Lan Management System."
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.1.bb b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.8.bb
index 2d2562eb..575a00e8 100644
--- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.1.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.8.bb
@@ -7,14 +7,15 @@ 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 = "9366c4e9b1850c4a1336682f7f16d9c1a8b03682"
-S = "${WORKDIR}/git"
+SRCREV = "df3b9ab0ffe780c4fbad7750987eff76f659cfd5"
 
 inherit pkgconfig autotools systemd gtk-doc
 
@@ -28,7 +29,7 @@ EXTRA_OECONF = " \
                  --with-systemdsystemunitdir=${systemd_system_unitdir} \
                  "
 
-FILES:${PN} += "${datadir}/dbus-1/system-services/*.service"
+FILES:${PN} += "${datadir}/dbus-1"
 
 SYSTEMD_SERVICE:${PN} = "thermald.service"