Drop upstreamed patches Release Notes: https://github.com/intel/lms/releases/tag/v2406.0.0.0
Signed-off-by: Yogesh Tyagi <[email protected]> --- ...eLists.txt-migrate-udev-rules-to-usr.patch | 33 ------------- .../recipes-bsp/amt/lms/fix-gcc13.patch | 46 ------------------- .../{lms_2322.0.0.0.bb => lms_2406.0.0.0.bb} | 4 +- 3 files changed, 1 insertion(+), 82 deletions(-) delete mode 100644 dynamic-layers/openembedded-layer/recipes-bsp/amt/lms/0001-UNS-CMakeLists.txt-migrate-udev-rules-to-usr.patch delete mode 100644 dynamic-layers/openembedded-layer/recipes-bsp/amt/lms/fix-gcc13.patch rename dynamic-layers/openembedded-layer/recipes-bsp/amt/{lms_2322.0.0.0.bb => lms_2406.0.0.0.bb} (90%) diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms/0001-UNS-CMakeLists.txt-migrate-udev-rules-to-usr.patch b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms/0001-UNS-CMakeLists.txt-migrate-udev-rules-to-usr.patch deleted file mode 100644 index 80b64b37..00000000 --- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms/0001-UNS-CMakeLists.txt-migrate-udev-rules-to-usr.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 072d20e6dcd99ff272a934fcfda8df9dd15d4359 Mon Sep 17 00:00:00 2001 -From: Naveen Saini <[email protected]> -Date: Fri, 16 Jun 2023 11:35:42 +0800 -Subject: [PATCH] UNS/CMakeLists.txt: migrate udev rules to /usr - -With the upcoming v254 release of systemd mandating usrmerge[1] this -will become mandatory for anyone using systemd. - -[1] https://lists.freedesktop.org/archives/systemd-devel/2023-June/049173.html - -Upstream-Status: Submitted [https://github.com/intel/lms/pull/16] - -Signed-off-by: Naveen Saini <[email protected]> ---- - UNS/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/UNS/CMakeLists.txt b/UNS/CMakeLists.txt -index 09000eb..c6b98c1 100644 ---- a/UNS/CMakeLists.txt -+++ b/UNS/CMakeLists.txt -@@ -139,7 +139,7 @@ if (UNIX) - install (FILES - ${CMAKE_CURRENT_SOURCE_DIR}/linux_scripts/70-persistent-mei.rules - ${CMAKE_CURRENT_SOURCE_DIR}/linux_scripts/70-mei-wdt.rules -- DESTINATION /lib/udev/rules.d/ -+ DESTINATION /usr/lib/udev/rules.d/ - ) - - install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/linux_scripts/20-lms.conf --- -2.34.1 - diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms/fix-gcc13.patch b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms/fix-gcc13.patch deleted file mode 100644 index 7e5e3bee..00000000 --- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms/fix-gcc13.patch +++ /dev/null @@ -1,46 +0,0 @@ -Upstream-Status: Pending -Signed-off-by: Anuj Mittal <[email protected]> - -diff --git a/MEIClient/AMTHIClient/Include/AmtAnsiString.h b/MEIClient/AMTHIClient/Include/AmtAnsiString.h -index 23114c9..deef61b 100644 ---- a/MEIClient/AMTHIClient/Include/AmtAnsiString.h -+++ b/MEIClient/AMTHIClient/Include/AmtAnsiString.h -@@ -12,6 +12,7 @@ - - #include <string> - #include <vector> -+#include <cstdint> - - namespace Intel - { -diff --git a/MEIClient/Include/MEIparser.h b/MEIClient/Include/MEIparser.h -index 0d47bb9..d4ffcd8 100644 ---- a/MEIClient/Include/MEIparser.h -+++ b/MEIClient/Include/MEIparser.h -@@ -8,6 +8,7 @@ - #include "MEIClientException.h" - #include <cstring> - #include <vector> -+#include <cstdint> - - namespace Intel - { -diff --git a/UNS/GMS_COMMON/FuncEntryExit.h b/UNS/GMS_COMMON/FuncEntryExit.h -index 21862ab..7165906 100644 ---- a/UNS/GMS_COMMON/FuncEntryExit.h -+++ b/UNS/GMS_COMMON/FuncEntryExit.h -@@ -5,6 +5,7 @@ - #ifndef FUNCENTRYEXIT_H - #define FUNCENTRYEXIT_H - #include "GMSCommonDllExport.h" -+#include <cstdint> - - GMS_COMMON_EXPORT void FlowLog(const wchar_t *name, const wchar_t *pref, const wchar_t *func); - GMS_COMMON_EXPORT void FuncEntry(const wchar_t *name, const wchar_t *func); -@@ -48,4 +49,4 @@ private: - const wchar_t * name_; - const wchar_t * func_; - }; --#endif // FUNCENTRYEXIT_H -\ No newline at end of file -+#endif // FUNCENTRYEXIT_H diff --git a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2322.0.0.0.bb b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb similarity index 90% rename from dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2322.0.0.0.bb rename to dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb index 9c02bb95..63b69ce8 100644 --- a/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2322.0.0.0.bb +++ b/dynamic-layers/openembedded-layer/recipes-bsp/amt/lms_2406.0.0.0.bb @@ -30,10 +30,8 @@ S = "${WORKDIR}/git" SYSTEMD_SERVICE:${PN} = "lms.service" SRC_URI = "git://github.com/intel/lms.git;branch=master;protocol=https \ - file://fix-gcc13.patch \ - file://0001-UNS-CMakeLists.txt-migrate-udev-rules-to-usr.patch \ " -SRCREV = "cbc1e1019cf5dc2d03a3b722ee07fbfb9a90f2d1" +SRCREV = "388f115b2aeb3ea11499971c65f828daefd32c47" do_install:append() { install -d ${D}${sysconfdir}/lms -- 2.34.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#8258): https://lists.yoctoproject.org/g/meta-intel/message/8258 Mute This Topic: https://lists.yoctoproject.org/mt/104860281/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-intel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
