diff options
| author | Anuj Mittal <anuj.mittal@intel.com> | 2020-09-10 15:55:05 +0800 |
|---|---|---|
| committer | Anuj Mittal <anuj.mittal@intel.com> | 2020-09-10 15:59:14 +0800 |
| commit | f7580d72763653893c06e1d9ece7a77c4adb8485 (patch) | |
| tree | eb10f5348473297aa8fd7ac50c553392d8320a37 /dynamic-layers | |
| parent | c6ca760d24dc016434e79a6aceeb608fba890a3c (diff) | |
| download | meta-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>
Diffstat (limited to 'dynamic-layers')
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 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 @@ | |||
| 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/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" | |||
| 24 | 24 | ||
| 25 | SYSTEMD_SERVICE_${PN} = "lms.service" | 25 | SYSTEMD_SERVICE_${PN} = "lms.service" |
| 26 | 26 | ||
| 27 | SRC_URI = "git://github.com/intel/lms.git" | 27 | SRC_URI = "git://github.com/intel/lms.git \ |
| 28 | file://0001-CIM_Framework-CMakeLists.txt-turn-OFF-BUILD_LIBCIM.patch \ | ||
| 29 | " | ||
| 28 | SRCREV = "597783800b000091e05855f1e7431555216e77da" | 30 | SRCREV = "597783800b000091e05855f1e7431555216e77da" |
| 29 | 31 | ||
| 30 | SRC_URI_append = " file://lms_drop_rpath_${PV}.diff" | 32 | SRC_URI_append = " file://lms_drop_rpath_${PV}.diff" |
