lms: upgrade 2022.0.0.0 -> 2039.1.0.0

Drop the patches that are no longer required.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Anuj Mittal 2020-11-27 11:09:28 +08:00
parent 64c71508c0
commit 5157e6ed01
3 changed files with 1 additions and 68 deletions

View File

@ -1,34 +0,0 @@
From 7f24e190bde4ee120e284cbdb59eed36ef8818f8 Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
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 <anuj.mittal@intel.com>
---
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

View File

@ -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

View File

@ -30,11 +30,8 @@ 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"
SRCREV = "11e6713f794b560328746ac39653d595f01361dc"
do_install_append() {
install -d ${D}${systemd_system_unitdir}