diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2020-11-27 11:09:28 +0800 |
---|---|---|
committer | Anuj Mittal <anuj.mittal@intel.com> | 2020-11-27 11:11:26 +0800 |
commit | 5157e6ed015a62304b40b181e2f891e61b8be652 (patch) | |
tree | 6a404a3e310999f3e7fe6047f02d7fedc014092a /dynamic-layers/openembedded-layer | |
parent | 64c71508c0f3e30089a8905dd094091793e006dc (diff) | |
download | meta-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>
Diffstat (limited to 'dynamic-layers/openembedded-layer')
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-bsp/amt/files/0001-CIM_Framework-CMakeLists.txt-turn-OFF-BUILD_LIBCIM.patch | 34 | ||||
-rw-r--r-- | dynamic-layers/openembedded-layer/recipes-bsp/amt/files/lms_drop_rpath_2022.0.0.0.diff | 30 | ||||
-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 @@ | |||
1 | From 7f24e190bde4ee120e284cbdb59eed36ef8818f8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Thu, 10 Sep 2020 15:44:09 +0800 | ||
4 | Subject: [PATCH] CIM_Framework/CMakeLists.txt: turn OFF BUILD_LIBCIM | ||
5 | |||
6 | BUILD_LIBCIM forces a check for libcmpisfcc in the top level makefile | ||
7 | for openwsman while the cim plugin itself isn't built if DISABLE_PLUGINS | ||
8 | is turned ON. This leads to an error when that library isn't present | ||
9 | even though we're not building that part of the code at all. | ||
10 | |||
11 | Turn OFF BUILD_LIBCIM in addition to DISABLE_PLUGINS. | ||
12 | |||
13 | Upstream-Status: Submitted [https://github.com/intel/lms/pull/4] | ||
14 | |||
15 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
16 | --- | ||
17 | CIM_Framework/CMakeLists.txt | 1 + | ||
18 | 1 file changed, 1 insertion(+) | ||
19 | |||
20 | diff --git a/CIM_Framework/CMakeLists.txt b/CIM_Framework/CMakeLists.txt | ||
21 | index 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 | -- | ||
33 | 2.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 @@ | |||
1 | From ec7d732a6a23e90be34840b0f1a57e5199d393cf Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Usyskin <alexander.usyskin@intel.com> | ||
3 | Date: Mon, 17 Jun 2019 13:27:33 +0300 | ||
4 | Subject: [PATCH] lms: drop rpath definitions | ||
5 | |||
6 | Yocto fail to compile with this definitions. | ||
7 | |||
8 | Upstream-Status: Inappropriate [configuration] | ||
9 | Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com> | ||
10 | --- | ||
11 | CMakeLists.txt | 3 --- | ||
12 | 1 file changed, 3 deletions(-) | ||
13 | |||
14 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
15 | index 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 | -- | ||
29 | 2.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" | |||
30 | SYSTEMD_SERVICE_${PN} = "lms.service" | 30 | SYSTEMD_SERVICE_${PN} = "lms.service" |
31 | 31 | ||
32 | SRC_URI = "git://github.com/intel/lms.git \ | 32 | SRC_URI = "git://github.com/intel/lms.git \ |
33 | file://0001-CIM_Framework-CMakeLists.txt-turn-OFF-BUILD_LIBCIM.patch \ | ||
34 | " | 33 | " |
35 | SRCREV = "597783800b000091e05855f1e7431555216e77da" | 34 | SRCREV = "11e6713f794b560328746ac39653d595f01361dc" |
36 | |||
37 | SRC_URI_append = " file://lms_drop_rpath_${PV}.diff" | ||
38 | 35 | ||
39 | do_install_append() { | 36 | do_install_append() { |
40 | install -d ${D}${systemd_system_unitdir} | 37 | install -d ${D}${systemd_system_unitdir} |