lms : upgrade 2322.0.0.0 -> 2406.0.0.0

Drop upstreamed patches

Release Notes:
https://github.com/intel/lms/releases/tag/v2406.0.0.0

Signed-off-by: Yogesh Tyagi <yogesh.tyagi@intel.com>
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Yogesh Tyagi 2024-03-11 03:18:55 -07:00 committed by Anuj Mittal
parent 353b0a4354
commit 1a7d12af5a
3 changed files with 1 additions and 82 deletions

View File

@ -1,33 +0,0 @@
From 072d20e6dcd99ff272a934fcfda8df9dd15d4359 Mon Sep 17 00:00:00 2001
From: Naveen Saini <naveen.kumar.saini@intel.com>
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 <naveen.kumar.saini@intel.com>
---
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

View File

@ -1,46 +0,0 @@
Upstream-Status: Pending
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
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

View File

@ -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