From 28261bb7e587d2a2ac6ad7437fbfc06da680b33b Mon Sep 17 00:00:00 2001 From: Alexander Usyskin Date: Tue, 6 Aug 2019 14:04:50 +0300 Subject: lms: upgrade 1921.0.0.0 -> 1932.0.0.0 Drop library packaging workarounds - not needed with a new sources. Signed-off-by: Alexander Usyskin Signed-off-by: Anuj Mittal --- .../amt/files/lms_drop_rpath_1921.0.0.0.diff | 31 ----------------- .../amt/files/lms_drop_rpath_1932.0.0.0.diff | 30 +++++++++++++++++ .../recipes-bsp/amt/lms_1921.0.0.0.bb | 39 ---------------------- .../recipes-bsp/amt/lms_1932.0.0.0.bb | 35 +++++++++++++++++++ 4 files changed, 65 insertions(+), 70 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-bsp/amt/files/lms_drop_rpath_1921.0.0.0.diff create mode 100644 dynamic-layers/openembedded-layer/recipes-bsp/amt/files/lms_drop_rpath_1932.0.0.0.diff delete mode 100644 dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_1921.0.0.0.bb create mode 100644 dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_1932.0.0.0.bb diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/lms_drop_rpath_1921.0.0.0.diff b/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/lms_drop_rpath_1921.0.0.0.diff deleted file mode 100644 index b68924a5..00000000 --- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/lms_drop_rpath_1921.0.0.0.diff +++ /dev/null @@ -1,31 +0,0 @@ -From b92a5bda8015454a570990a3d9c4fba87010f1af Mon Sep 17 00:00:00 2001 -From: Alexander Usyskin -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 ---- - CMakeLists.txt | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 04257fb..85d0445 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -107,10 +107,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") --list (APPEND CMAKE_INSTALL_RPATH "${PROJECT_BINARY_DIR}/UNS/StatusEventHandler") -- - if (BUILD_TESTS) - include (gtest.cmake) - endif (BUILD_TESTS) --- -2.7.4 - diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/lms_drop_rpath_1932.0.0.0.diff b/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/lms_drop_rpath_1932.0.0.0.diff new file mode 100644 index 00000000..dae02e50 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/files/lms_drop_rpath_1932.0.0.0.diff @@ -0,0 +1,30 @@ +From ec7d732a6a23e90be34840b0f1a57e5199d393cf Mon Sep 17 00:00:00 2001 +From: Alexander Usyskin +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 +--- + CMakeLists.txt | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a303c4b..9bda082 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -109,9 +109,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_1921.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_1921.0.0.0.bb deleted file mode 100644 index 8ed74486..00000000 --- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_1921.0.0.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Intel(R) Local Managability Service" -DESCRIPTION = "Intel Local Manageability Service allows applications \ -to access the Intel Active Management Technology (AMT) firmware via \ -the Intel Management Engine Interface (MEI)." - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=2ee41112a44fe7014dce33e26468ba93" - -COMPATIBLE_HOST = '(i.86|x86_64).*-linux' - -inherit cmake systemd - -DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native connman" - -EXTRA_OECMAKE += "-DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3" - -REQUIRED_DISTRO_FEATURES= "systemd" - -FILES_${PN} += "${datadir}/dbus-1/system-services/*.service" - -FILES_${PN} += "${libdir}/libLms*.so" -FILES_SOLIBSDEV = "" -INSANE_SKIP_${PN} += "dev-so" - -S = "${WORKDIR}/git" - -SYSTEMD_SERVICE_${PN} = "lms.service" - -SRC_URI = "git://github.com/intel/lms.git" -SRCREV = "f7c374745ae7efb3ed7860fdc3f8abbb52dc9f8f" - -SRC_URI_append = " file://lms_drop_rpath_${PV}.diff" - -do_install_append() { - install -d ${D}${systemd_system_unitdir} - install -m 0644 ${B}/UNS/lms.service ${D}${systemd_system_unitdir} -} - -RDEPENDS_${PN} += "ace" diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_1932.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_1932.0.0.0.bb new file mode 100644 index 00000000..76baa9f3 --- /dev/null +++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_1932.0.0.0.bb @@ -0,0 +1,35 @@ +SUMMARY = "Intel(R) Local Managability Service" +DESCRIPTION = "Intel Local Manageability Service allows applications \ +to access the Intel Active Management Technology (AMT) firmware via \ +the Intel Management Engine Interface (MEI)." + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=2ee41112a44fe7014dce33e26468ba93" + +COMPATIBLE_HOST = '(i.86|x86_64).*-linux' + +inherit cmake systemd + +DEPENDS = "metee ace xerces-c libnl libxml2 glib-2.0 glib-2.0-native connman" + +EXTRA_OECMAKE += "-DPYTHON_EXECUTABLE=${HOSTTOOLS_DIR}/python3" + +REQUIRED_DISTRO_FEATURES= "systemd" + +FILES_${PN} += "${datadir}/dbus-1/system-services/*.service" + +S = "${WORKDIR}/git" + +SYSTEMD_SERVICE_${PN} = "lms.service" + +SRC_URI = "git://github.com/intel/lms.git" +SRCREV = "f90fa51f07514b7644cc57846c90e46b146b23ae" + +SRC_URI_append = " file://lms_drop_rpath_${PV}.diff" + +do_install_append() { + install -d ${D}${systemd_system_unitdir} + install -m 0644 ${B}/UNS/lms.service ${D}${systemd_system_unitdir} +} + +RDEPENDS_${PN} += "ace" -- cgit v1.2.3-54-g00ecf