summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2020-11-27 11:09:28 +0800
committerAnuj Mittal <anuj.mittal@intel.com>2020-11-27 11:11:26 +0800
commit5157e6ed015a62304b40b181e2f891e61b8be652 (patch)
tree6a404a3e310999f3e7fe6047f02d7fedc014092a
parent64c71508c0f3e30089a8905dd094091793e006dc (diff)
downloadmeta-intel-5157e6ed015a62304b40b181e2f891e61b8be652.tar.gz
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>
-rw-r--r--dynamic-layers/openembedded-layer/recipes-bsp/amt/files/0001-CIM_Framework-CMakeLists.txt-turn-OFF-BUILD_LIBCIM.patch34
-rw-r--r--dynamic-layers/openembedded-layer/recipes-bsp/amt/files/lms_drop_rpath_2022.0.0.0.diff30
-rw-r--r--dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2039.1.0.0.bb (renamed from dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2022.0.0.0.bb)5
3 files changed, 1 insertions, 68 deletions
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 @@
1From 7f24e190bde4ee120e284cbdb59eed36ef8818f8 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Thu, 10 Sep 2020 15:44:09 +0800
4Subject: [PATCH] CIM_Framework/CMakeLists.txt: turn OFF BUILD_LIBCIM
5
6BUILD_LIBCIM forces a check for libcmpisfcc in the top level makefile
7for openwsman while the cim plugin itself isn't built if DISABLE_PLUGINS
8is turned ON. This leads to an error when that library isn't present
9even though we're not building that part of the code at all.
10
11Turn OFF BUILD_LIBCIM in addition to DISABLE_PLUGINS.
12
13Upstream-Status: Submitted [https://github.com/intel/lms/pull/4]
14
15Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
16---
17 CIM_Framework/CMakeLists.txt | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/CIM_Framework/CMakeLists.txt b/CIM_Framework/CMakeLists.txt
21index 9d287f9..60219b3 100644
22--- a/CIM_Framework/CMakeLists.txt
23+++ b/CIM_Framework/CMakeLists.txt
24@@ -53,6 +53,7 @@ externalproject_add (openwsman
25 -DUSE_PAM=OFF
26 -DENABLE_EVENTING_SUPPORT=OFF
27 -DBUILD_SHARED_LIBS=OFF
28+ -DBUILD_LIBCIM=OFF
29 ${WSMAN_STATIC_RUNTIME}
30 ${WSMAN_ARCH}
31 ${USE_TOOLCHAIN}
32--
332.26.2
34
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 @@
1From ec7d732a6a23e90be34840b0f1a57e5199d393cf Mon Sep 17 00:00:00 2001
2From: Alexander Usyskin <alexander.usyskin@intel.com>
3Date: Mon, 17 Jun 2019 13:27:33 +0300
4Subject: [PATCH] lms: drop rpath definitions
5
6Yocto fail to compile with this definitions.
7
8Upstream-Status: Inappropriate [configuration]
9Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
10---
11 CMakeLists.txt | 3 ---
12 1 file changed, 3 deletions(-)
13
14diff --git a/CMakeLists.txt b/CMakeLists.txt
15index e22ff05..14d5dd1 100644
16--- a/CMakeLists.txt
17+++ b/CMakeLists.txt
18@@ -112,9 +112,6 @@ install (DIRECTORY Docs/Licenses
19 FILES_MATCHING PATTERN "LICENSE.*"
20 )
21
22-list (APPEND CMAKE_INSTALL_RPATH "${PROJECT_BINARY_DIR}/UNS/GMS_COMMON")
23-list (APPEND CMAKE_INSTALL_RPATH "${PROJECT_BINARY_DIR}/WsmanClient")
24-
25 if (BUILD_TESTS)
26 include (gtest.cmake)
27 endif (BUILD_TESTS)
28--
292.7.4
30
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_2039.1.0.0.bb
index 63bc7b6a..68b60c8e 100644
--- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2022.0.0.0.bb
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2039.1.0.0.bb
@@ -30,11 +30,8 @@ S = "${WORKDIR}/git"
30SYSTEMD_SERVICE_${PN} = "lms.service" 30SYSTEMD_SERVICE_${PN} = "lms.service"
31 31
32SRC_URI = "git://github.com/intel/lms.git \ 32SRC_URI = "git://github.com/intel/lms.git \
33 file://0001-CIM_Framework-CMakeLists.txt-turn-OFF-BUILD_LIBCIM.patch \
34 " 33 "
35SRCREV = "597783800b000091e05855f1e7431555216e77da" 34SRCREV = "11e6713f794b560328746ac39653d595f01361dc"
36
37SRC_URI_append = " file://lms_drop_rpath_${PV}.diff"
38 35
39do_install_append() { 36do_install_append() {
40 install -d ${D}${systemd_system_unitdir} 37 install -d ${D}${systemd_system_unitdir}