3 files changed, 44 insertions, 67 deletions

diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/lms_drop_rpath_2003.0.0.0.diff b/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/lms_drop_rpath_2003.0.0.0.diff
deleted file mode 100644
index e000a160..00000000
--- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/lms_drop_rpath_2003.0.0.0.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-From ec7d732a6a23e90be34840b0f1a57e5199d393cf Mon Sep 17 00:00:00 2001
-From: Alexander Usyskin <alexander.usyskin@intel.com>
-Date: Mon, 17 Jun 2019 13:27:33 +0300
-Subject: [PATCH] lms: drop rpath definitions
-
-Yocto fail to compile with this definitions.
-
-Upstream-Status: Inappropriate [configuration]
-Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
----
- CMakeLists.txt | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e22ff05..14d5dd1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -112,9 +112,6 @@ install (DIRECTORY Docs/Licenses
-   FILES_MATCHING PATTERN "LICENSE.*"
- )
- 
--list (APPEND CMAKE_INSTALL_RPATH "${PROJECT_BINARY_DIR}/UNS/GMS_COMMON")
--list (APPEND CMAKE_INSTALL_RPATH "${PROJECT_BINARY_DIR}/WsmanClient")
--
- if (BUILD_TESTS)
-   include (gtest.cmake)
- endif (BUILD_TESTS)
--- 
-2.7.4
-
diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2003.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2003.0.0.0.bb
deleted file mode 100644
index 1067ccbd..00000000
--- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2003.0.0.0.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-SUMMARY = "Intel(R) Local Managability Service"
-DESCRIPTION = "Intel Local Manageability Service allows applications \
-to access the Intel Active Management Technology (AMT) firmware via \
-the Intel Management Engine Interface (MEI)."
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=2ee41112a44fe7014dce33e26468ba93"
-
-COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
-
-COMPATIBLE_HOST_libc-musl = "null"
-
-inherit cmake systemd
-
-DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native connman"
-
-EXTRA_OECMAKE += "-DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3"
-
-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"
-SRCREV = "e425f34fadf9bb71228ffa23c6459331d86a0ab2"
-
-SRC_URI_append = " file://lms_drop_rpath_${PV}.diff"
-
-do_install_append() {
-    install -d ${D}${systemd_system_unitdir}
-    install -m 0644 ${B}/UNS/lms.service ${D}${systemd_system_unitdir}
-}
-
-RDEPENDS_${PN} += "ace"
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
new file mode 100644
index 00000000..bdf32576
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb
@@ -0,0 +1,44 @@
+SUMMARY = "Intel(R) Local Managability Service"
+DESCRIPTION = "Intel Local Manageability Service allows applications \
+to access the Intel Active Management Technology (AMT) firmware via \
+the Intel Management Engine Interface (MEI)."
+
+LICENSE = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=2ee41112a44fe7014dce33e26468ba93"
+
+COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
+
+COMPATIBLE_HOST:libc-musl = "null"
+
+inherit cmake systemd features_check python3native
+
+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"
+
+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 \
+           "
+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
+    install -m 0644 ${S}/UNS/linux_scripts/70-mei-wdt.rules ${D}${sysconfdir}/udev/rules.d/70-mei-wdt.rules
+}
+
+RDEPENDS:${PN} += "ace"
+
+CVE_STATUS[CVE-2018-1000535] = "cpe-incorrect: This CVE is for a different LMS - Lan Management System."