Drop the patches that are no longer required. Signed-off-by: Anuj Mittal <[email protected]> --- ...CMakeLists.txt-turn-OFF-BUILD_LIBCIM.patch | 34 ------------------- .../amt/files/lms_drop_rpath_2022.0.0.0.diff | 30 ---------------- .../{lms_2022.0.0.0.bb => lms_2039.1.0.0.bb} | 5 +-- 3 files changed, 1 insertion(+), 68 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-bsp/amt/files/0001-CIM_Framework-CMakeLists.txt-turn-OFF-BUILD_LIBCIM.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-bsp/amt/files/lms_drop_rpath_2022.0.0.0.diff rename dynamic-layers/openembedded-layer/recipes-bsp/amt/{lms_2022.0.0.0.bb => lms_2039.1.0.0.bb} (86%)
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 @@ -From 7f24e190bde4ee120e284cbdb59eed36ef8818f8 Mon Sep 17 00:00:00 2001 -From: Anuj Mittal <[email protected]> -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 <[email protected]> ---- - 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/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 @@ -From ec7d732a6a23e90be34840b0f1a57e5199d393cf Mon Sep 17 00:00:00 2001 -From: Alexander Usyskin <[email protected]> -Date: Mon, 17 Jun 2019 13:27:33 +0300 -Subject: [PATCH] lms: drop rpath definitions - -Yocto fail to compile with this definitions. - -Upstream-Status: Inappropriate [configuration] -Signed-off-by: Alexander Usyskin <[email protected]> ---- - CMakeLists.txt | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e22ff05..14d5dd1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -112,9 +112,6 @@ install (DIRECTORY Docs/Licenses - FILES_MATCHING PATTERN "LICENSE.*" - ) - --list (APPEND CMAKE_INSTALL_RPATH "${PROJECT_BINARY_DIR}/UNS/GMS_COMMON") --list (APPEND CMAKE_INSTALL_RPATH "${PROJECT_BINARY_DIR}/WsmanClient") -- - if (BUILD_TESTS) - include (gtest.cmake) - endif (BUILD_TESTS) --- -2.7.4 - 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 similarity index 86% rename from dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2022.0.0.0.bb rename to 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" SYSTEMD_SERVICE_${PN} = "lms.service" 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" +SRCREV = "11e6713f794b560328746ac39653d595f01361dc" do_install_append() { install -d ${D}${systemd_system_unitdir} -- 2.28.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#6834): https://lists.yoctoproject.org/g/meta-intel/message/6834 Mute This Topic: https://lists.yoctoproject.org/mt/78542627/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
