summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2020-09-10 07:55:05 (GMT)
committerAnuj Mittal <anuj.mittal@intel.com>2020-09-10 07:59:14 (GMT)
commitf7580d72763653893c06e1d9ece7a77c4adb8485 (patch)
treeeb10f5348473297aa8fd7ac50c553392d8320a37
parentc6ca760d24dc016434e79a6aceeb608fba890a3c (diff)
downloadmeta-intel-f7580d72763653893c06e1d9ece7a77c4adb8485.tar.gz
lms: fix build
Disable the compilation of cim plugin of openwsman explicitly to avoid looking for library that is needed for code we don't want to build. Fixes: | CMake Error at CMakeLists.txt:329 (FIND_LIBRARY): | Could not find SFCC_LIBRARIES using the following names: cmpisfcc 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/lms_2022.0.0.0.bb4
2 files changed, 37 insertions, 1 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
new file mode 100644
index 0000000..d3b1031
--- /dev/null
+++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/0001-CIM_Framework-CMakeLists.txt-turn-OFF-BUILD_LIBCIM.patch
@@ -0,0 +1,34 @@
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/lms_2022.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2022.0.0.0.bb
index b0eb0f2..4b1e35f 100644
--- 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
@@ -24,7 +24,9 @@ S = "${WORKDIR}/git"
24 24
25SYSTEMD_SERVICE_${PN} = "lms.service" 25SYSTEMD_SERVICE_${PN} = "lms.service"
26 26
27SRC_URI = "git://github.com/intel/lms.git" 27SRC_URI = "git://github.com/intel/lms.git \
28 file://0001-CIM_Framework-CMakeLists.txt-turn-OFF-BUILD_LIBCIM.patch \
29 "
28SRCREV = "597783800b000091e05855f1e7431555216e77da" 30SRCREV = "597783800b000091e05855f1e7431555216e77da"
29 31
30SRC_URI_append = " file://lms_drop_rpath_${PV}.diff" 32SRC_URI_append = " file://lms_drop_rpath_${PV}.diff"