From 5157e6ed015a62304b40b181e2f891e61b8be652 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Fri, 27 Nov 2020 11:09:28 +0800 Subject: lms: upgrade 2022.0.0.0 -> 2039.1.0.0 Drop the patches that are no longer required. Signed-off-by: Anuj Mittal --- ...work-CMakeLists.txt-turn-OFF-BUILD_LIBCIM.patch | 34 ----------------- .../amt/files/lms_drop_rpath_2022.0.0.0.diff | 30 --------------- .../recipes-bsp/amt/lms_2022.0.0.0.bb | 44 ---------------------- .../recipes-bsp/amt/lms_2039.1.0.0.bb | 41 ++++++++++++++++++++ 4 files changed, 41 insertions(+), 108 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-bsp/amt/files/0001-CIM_Framework-CMakeLists.txt-turn-OFF-BUILD_LIBCIM.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-bsp/amt/files/lms_drop_rpath_2022.0.0.0.diff delete mode 100644 dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2022.0.0.0.bb create mode 100644 dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2039.1.0.0.bb (limited to 'dynamic-layers') diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/0001-CIM_Framework-CMakeLists.txt-turn-OFF-BUILD_LIBCIM.patch b/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/0001-CIM_Framework-CMakeLists.txt-turn-OFF-BUILD_LIBCIM.patch deleted file mode 100644 index d3b10319..00000000 --- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/0001-CIM_Framework-CMakeLists.txt-turn-OFF-BUILD_LIBCIM.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7f24e190bde4ee120e284cbdb59eed36ef8818f8 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal -Date: Thu, 10 Sep 2020 15:44:09 +0800 -Subject: [PATCH] CIM_Framework/CMakeLists.txt: turn OFF BUILD_LIBCIM - -BUILD_LIBCIM forces a check for libcmpisfcc in the top level makefile -for openwsman while the cim plugin itself isn't built if DISABLE_PLUGINS -is turned ON. This leads to an error when that library isn't present -even though we're not building that part of the code at all. - -Turn OFF BUILD_LIBCIM in addition to DISABLE_PLUGINS. - -Upstream-Status: Submitted [https://github.com/intel/lms/pull/4] - -Signed-off-by: Anuj Mittal ---- - CIM_Framework/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/CIM_Framework/CMakeLists.txt b/CIM_Framework/CMakeLists.txt -index 9d287f9..60219b3 100644 ---- a/CIM_Framework/CMakeLists.txt -+++ b/CIM_Framework/CMakeLists.txt -@@ -53,6 +53,7 @@ externalproject_add (openwsman - -DUSE_PAM=OFF - -DENABLE_EVENTING_SUPPORT=OFF - -DBUILD_SHARED_LIBS=OFF -+ -DBUILD_LIBCIM=OFF - ${WSMAN_STATIC_RUNTIME} - ${WSMAN_ARCH} - ${USE_TOOLCHAIN} --- -2.26.2 - diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/lms_drop_rpath_2022.0.0.0.diff b/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/lms_drop_rpath_2022.0.0.0.diff deleted file mode 100644 index e000a160..00000000 --- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/lms_drop_rpath_2022.0.0.0.diff +++ /dev/null @@ -1,30 +0,0 @@ -From ec7d732a6a23e90be34840b0f1a57e5199d393cf Mon Sep 17 00:00:00 2001 -From: Alexander Usyskin -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 ---- - 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_2022.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2022.0.0.0.bb deleted file mode 100644 index 63bc7b6a..00000000 --- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2022.0.0.0.bb +++ /dev/null @@ -1,44 +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 features_check - -DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native" - -EXTRA_OECMAKE += "-DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3" - -# 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 \ - file://0001-CIM_Framework-CMakeLists.txt-turn-OFF-BUILD_LIBCIM.patch \ - " -SRCREV = "597783800b000091e05855f1e7431555216e77da" - -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_2039.1.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2039.1.0.0.bb new file mode 100644 index 00000000..68b60c8e --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2039.1.0.0.bb @@ -0,0 +1,41 @@ +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 + +DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native" + +EXTRA_OECMAKE += "-DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3" + +# 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 \ + " +SRCREV = "11e6713f794b560328746ac39653d595f01361dc" + +do_install_append() { + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${B}/UNS/lms.service ${D}${systemd_system_unitdir} +} + +RDEPENDS_${PN} += "ace" -- cgit v1.2.3-54-g00ecf