From f7580d72763653893c06e1d9ece7a77c4adb8485 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Thu, 10 Sep 2020 15:55:05 +0800 Subject: 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 --- ...work-CMakeLists.txt-turn-OFF-BUILD_LIBCIM.patch | 34 ++++++++++++++++++++++ .../recipes-bsp/amt/lms_2022.0.0.0.bb | 4 ++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 dynamic-layers/openembedded-layer/recipes-bsp/amt/files/0001-CIM_Framework-CMakeLists.txt-turn-OFF-BUILD_LIBCIM.patch (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 new file mode 100644 index 00000000..d3b10319 --- /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 @@ +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/lms_2022.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2022.0.0.0.bb index b0eb0f20..4b1e35f0 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" SYSTEMD_SERVICE_${PN} = "lms.service" -SRC_URI = "git://github.com/intel/lms.git" +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" -- cgit v1.2.3-54-g00ecf