3 files changed, 59 insertions, 18 deletions

diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2109.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb
index af5a2314..bdf32576 100644
--- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2109.0.0.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb
@@ -8,13 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2ee41112a44fe7014dce33e26468ba93"
 
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
-COMPATIBLE_HOST_libc-musl = "null"
+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"
-
-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"
@@ -23,19 +21,24 @@ PACKAGECONFIG[networkmanager] = "-DNETWORK_NM=ON, -DNETWORK_NM=OFF, networkmanag
 
 REQUIRED_DISTRO_FEATURES= "systemd"
 
-FILES_${PN} += "${datadir}/dbus-1/system-services/*.service"
+FILES:${PN} += "${datadir}/dbus-1/system-services/*.service"
 
 S = "${WORKDIR}/git"
 
-SYSTEMD_SERVICE_${PN} = "lms.service"
+SYSTEMD_SERVICE:${PN} = "lms.service"
 
-SRC_URI = "git://github.com/intel/lms.git \
+SRC_URI = "git://github.com/intel/lms.git;branch=master;protocol=https \
            "
-SRCREV = "e0ebda9d1e7884b51293b71c1bcda511a7942e1a"
+SRCREV = "388f115b2aeb3ea11499971c65f828daefd32c47"
 
-do_install_append() {
+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
+    install -m 0644 ${S}/UNS/linux_scripts/70-mei-wdt.rules ${D}${sysconfdir}/udev/rules.d/70-mei-wdt.rules
 }
 
-RDEPENDS_${PN} += "ace"
+RDEPENDS:${PN} += "ace"
+
+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/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..ea86bc31
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/files/0001-Makefile-Fix-build-Issue.patch
@@ -0,0 +1,35 @@
+From 1f6f4e29769adb9d49a3c4831dd2ba61f6ccbdce 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 dd2ef10..cb19e17 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -97,6 +97,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)
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.4.4.bb b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.7.bb
index efad2fe3..66765e56 100644
--- a/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.4.4.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/thermald/thermald_2.5.7.bb
@@ -7,20 +7,23 @@ 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"
-LICENSE = "GPLv2"
+DEPENDS += "autoconf-archive-native"
+
+LICENSE = "GPL-2.0-only"
 LIC_FILES_CHKSUM = "file://COPYING;md5=ea8831610e926e2e469075b52bf08848"
 
-SRC_URI = "git://github.com/intel/thermal_daemon/ \
+SRC_URI = "git://github.com/intel/thermal_daemon/;branch=master;protocol=https \
+           file://0001-Makefile-Fix-build-Issue.patch \
            "
 
-SRCREV = "d6f89c9e8afdb449a442646da46f3140634175c1"
+SRCREV = "ea8b773f76641a7a49d6584669e17371c22ad03e"
 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 () {
+do_configure:prepend () {
         mkdir -p ${S}/m4
 }
 
@@ -28,13 +31,13 @@ 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"
+SYSTEMD_SERVICE:${PN} = "thermald.service"
 
 COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
 
-CONFFILES_${PN} = " \
+CONFFILES:${PN} = " \
                    ${sysconfdir}/thermald/thermal-conf.xml \
                    ${sysconfdir}/thermald/thermal-cpu-cdev-order.xml \
                   "