mirror of
git://git.yoctoproject.org/meta-intel.git
synced 2025-07-19 12:59:03 +02:00
lms8: remove
Obsolete and not being maintained anymore. Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
This commit is contained in:
Anuj Mittal
parent
12acdbe9d8
commit
8bca950b8a
|
|
@ -12,6 +12,5 @@ RECIPE_MAINTAINER_pn-libyami = "Anuj Mittal <anuj.mittal@intel.com>"
|
|||
RECIPE_MAINTAINER_pn-libyami-utils = "Anuj Mittal <anuj.mittal@intel.com>"
|
||||
RECIPE_MAINTAINER_pn-linux-intel = "Anuj Mittal <anuj.mittal@intel.com>"
|
||||
RECIPE_MAINTAINER_pn-linux-intel-rt = "Anuj Mittal <anuj.mittal@intel.com>"
|
||||
RECIPE_MAINTAINER_pn-lms8 = "Anuj Mittal <anuj.mittal@intel.com>"
|
||||
RECIPE_MAINTAINER_pn-thermald = "Anuj Mittal <anuj.mittal@intel.com>"
|
||||
RECIPE_MAINTAINER_pn-xf86-video-ast = "Anuj Mittal <anuj.mittal@intel.com>"
|
||||
|
|
|
|||
|
|
@ -1,28 +0,0 @@
|
|||
From 518a3a277c89a3d6b0a9d3ee552cfa33a1dbd5c6 Mon Sep 17 00:00:00 2001
|
||||
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
Date: Mon, 23 Jan 2017 20:45:08 +0200
|
||||
Subject: [PATCH 1/2] Include sys/select.h for fd_set()
|
||||
|
||||
This is needed at least on musl.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
---
|
||||
src/mei/MEILinux.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/mei/MEILinux.cpp b/src/mei/MEILinux.cpp
|
||||
index 1e9d28f..631270e 100755
|
||||
--- a/src/mei/MEILinux.cpp
|
||||
+++ b/src/mei/MEILinux.cpp
|
||||
@@ -37,6 +37,7 @@
|
||||
#include <cerrno>
|
||||
#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
+#include <sys/select.h>
|
||||
#include <unistd.h>
|
||||
#include <stdint.h>
|
||||
#include <aio.h>
|
||||
--
|
||||
2.1.4
|
||||
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
From 8d737ba9745bef223c3d3b96899f11c26102ea04 Mon Sep 17 00:00:00 2001
|
||||
From: Saul Wold <sgw@linux.intel.com>
|
||||
Date: Mon, 16 May 2016 09:01:05 -0700
|
||||
Subject: [PATCH] Protocol.cpp: Add whitespace for gcc6 compile error
|
||||
|
||||
When moving from C++-3 -> C++11 additiona white space is required between
|
||||
User-defined literals.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Saul Wold <sgw@linux.intel.com>
|
||||
---
|
||||
src/Protocol.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/Protocol.cpp b/src/Protocol.cpp
|
||||
index 1c21a0f..3a4a9bb 100755
|
||||
--- a/src/Protocol.cpp
|
||||
+++ b/src/Protocol.cpp
|
||||
@@ -1428,7 +1428,7 @@ int Protocol::_handleFQDNChange(const char *fqdn)
|
||||
char host[FQDN_MAX_SIZE + 1];
|
||||
#define LMS_MAX_LINE_LEN 1023
|
||||
char line[LMS_MAX_LINE_LEN + 1];
|
||||
-#define LMS_LINE_SIG_FIRST_WORDS(a) "# LMS GENERATED "a" "
|
||||
+#define LMS_LINE_SIG_FIRST_WORDS(a) "# LMS GENERATED " a " "
|
||||
#define LMS_LINE_SIG_LAST_WORD "LINE"
|
||||
#define LMS_LINE_SIG_LAST_WORD_LEN 4
|
||||
#define LMS_LINE_SIG(a) LMS_LINE_SIG_FIRST_WORDS(a) LMS_LINE_SIG_LAST_WORD
|
||||
--
|
||||
2.5.0
|
||||
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
From 0adc925ca9e005f93d77f373ccda2a6c6cc3ff2f Mon Sep 17 00:00:00 2001
|
||||
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
Date: Mon, 23 Jan 2017 20:46:50 +0200
|
||||
Subject: [PATCH 2/2] Use proper netinet/in.h API
|
||||
|
||||
in6addr is only guaranteed to contain this member:
|
||||
uint8_t s6_addr[16]
|
||||
Use that instead of the glibc implementation detail __in6_u.
|
||||
|
||||
Upstream-Status: Pending
|
||||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
---
|
||||
src/tools/ATNetworkTool.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/tools/ATNetworkTool.cpp b/src/tools/ATNetworkTool.cpp
|
||||
index 66e27df..0789c79 100755
|
||||
--- a/src/tools/ATNetworkTool.cpp
|
||||
+++ b/src/tools/ATNetworkTool.cpp
|
||||
@@ -207,7 +207,7 @@ int ATNetworkTool::GetSockPeerIP(int sock, ATAddressList & peerAddresses, int &e
|
||||
if(sa->sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&addr)) //if(IN6_IS_ADDR_V4COMPAT(&addr))
|
||||
{
|
||||
struct in_addr demapped_addr;
|
||||
- memcpy(&demapped_addr.s_addr, &addr.__in6_u.__u6_addr8[12], 4);
|
||||
+ memcpy(&demapped_addr.s_addr, &addr.s6_addr[12], 4);
|
||||
|
||||
struct sockaddr_in sa_in;
|
||||
sa_in.sin_family = AF_INET;
|
||||
--
|
||||
2.1.4
|
||||
|
||||
|
|
@ -1,91 +0,0 @@
|
|||
Fix device file referance to /dev/mei0, remove select post write.
|
||||
|
||||
LMS uses /dev/mei character device which is absent on current kernel versions causing LMS fail to initialize. LMS sends messages to MEI with a post select timeout. Select timeout causes SendMessage to fail causing LMS to not to communicate properly with MEI.
|
||||
|
||||
Adding /dev/mei0 device file reference to check first and then /dev/mei sucessfully initializes LMS. Rely on write return length and remove select with timeout to fix communication with MEI.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Anand Vastrad <anand.vastrad@intel.com>
|
||||
---
|
||||
src/mei/MEILinux.cpp | 43 +++++++------------------------------------
|
||||
1 file changed, 7 insertions(+), 36 deletions(-)
|
||||
|
||||
diff --git a/src/mei/MEILinux.cpp b/src/mei/MEILinux.cpp
|
||||
index 1e9d28f..6d23f54 100755
|
||||
--- a/src/mei/MEILinux.cpp
|
||||
+++ b/src/mei/MEILinux.cpp
|
||||
@@ -94,13 +94,17 @@ bool MEILinux::Init(unsigned char reqProtocolVersion)
|
||||
Deinit();
|
||||
}
|
||||
|
||||
- _fd = open("/dev/mei", O_RDWR);
|
||||
+ _fd = open("/dev/mei0", O_RDWR);
|
||||
|
||||
if (_fd == -1 ) {
|
||||
if (_verbose) {
|
||||
- fprintf(stderr, "Error: Cannot establish a handle to the MEI driver\n");
|
||||
+ fprintf(stderr, "Warning: Cannot establish a handle to the MEI driver mei0, retrying with mei \n");
|
||||
+ }
|
||||
+ _fd = open("/dev/mei", O_RDWR);
|
||||
+ if (_fd == -1 ) {
|
||||
+ fprintf(stderr, "Error: Cannot establish a handle to the MEI driver mei\n");
|
||||
+ return false;
|
||||
}
|
||||
- return false;
|
||||
}
|
||||
_initialized = true;
|
||||
|
||||
@@ -181,13 +185,7 @@ int MEILinux::ReceiveMessage(unsigned char *buffer, int len, unsigned long timeo
|
||||
int MEILinux::SendMessage(const unsigned char *buffer, int len, unsigned long timeout)
|
||||
{
|
||||
int rv = 0;
|
||||
- int return_length =0;
|
||||
int error = 0;
|
||||
- fd_set set;
|
||||
- struct timeval tv;
|
||||
-
|
||||
- tv.tv_sec = timeout / 1000;
|
||||
- tv.tv_usec =(timeout % 1000) * 1000000;
|
||||
|
||||
if (_verbose) {
|
||||
fprintf(stdout, "call write length = %d\n", len);
|
||||
@@ -198,35 +196,8 @@ int MEILinux::SendMessage(const unsigned char *buffer, int len, unsigned long ti
|
||||
if (_verbose) {
|
||||
fprintf(stderr,"write failed with status %d %d\n", rv, error);
|
||||
}
|
||||
- goto out;
|
||||
- }
|
||||
-
|
||||
- return_length = rv;
|
||||
-
|
||||
- FD_ZERO(&set);
|
||||
- FD_SET(_fd, &set);
|
||||
- rv = select(_fd+1 ,&set, NULL, NULL, &tv);
|
||||
- if (rv > 0 && FD_ISSET(_fd, &set)) {
|
||||
- if (_verbose) {
|
||||
- fprintf(stderr, "write success\n");
|
||||
- }
|
||||
}
|
||||
- else if (rv == 0) {
|
||||
- if (_verbose) {
|
||||
- fprintf(stderr, "write failed on timeout with status\n");
|
||||
- }
|
||||
- goto out;
|
||||
- }
|
||||
- else { //rv<0
|
||||
- if (_verbose) {
|
||||
- fprintf(stderr, "write failed on select with status %d\n", rv);
|
||||
- }
|
||||
- goto out;
|
||||
- }
|
||||
-
|
||||
- rv = return_length;
|
||||
|
||||
-out:
|
||||
if (rv < 0) {
|
||||
Deinit();
|
||||
}
|
||||
--
|
||||
2.7.4
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,18 +0,0 @@
|
|||
Add a missing include causing compilation (missing declaration) problems.
|
||||
|
||||
Upstream-Status: Submitted
|
||||
|
||||
Signed-off-by: Tom Zanussi <tom.zanussi (a] intel.com>
|
||||
|
||||
Index: lms-7.1.20/src/tools/ATVersion.cpp
|
||||
===================================================================
|
||||
--- lms-7.1.20.orig/src/tools/ATVersion.cpp 2012-05-29 20:34:34.061997035 -0500
|
||||
+++ lms-7.1.20/src/tools/ATVersion.cpp 2012-05-29 20:35:22.671412948 -0500
|
||||
@@ -40,6 +40,7 @@
|
||||
#include <cerrno>
|
||||
#include <fstream>
|
||||
#include <dirent.h>
|
||||
+#include <unistd.h>
|
||||
|
||||
#define AT_VERSION_ARGUMENT "--version"
|
||||
#define AT_VERSION_MAXSIZE 40
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
DESCRIPTION = "Intel Local Manageability Service allows applications \
|
||||
to access the Intel Active Management Technology (AMT) firmware via \
|
||||
the Intel Management Engine Interface (MEI)."
|
||||
HOMEPAGE = "http://software.intel.com/en-us/articles/download-the-latest-intel-amt-open-source-drivers"
|
||||
|
||||
LICENSE = "BSD_LMS"
|
||||
|
||||
PR = "r0"
|
||||
BPN="lms"
|
||||
SRC_URI = "http://software.intel.com/sites/default/files/${BPN}-${PV}.tar.gz \
|
||||
file://readlink-declaration.patch \
|
||||
file://0001-Protocol.cpp-Add-whitespace-for-gcc6-compile-error.patch \
|
||||
file://0001-Include-sys-select.h-for-fd_set.patch \
|
||||
file://0002-Use-proper-netinet-in.h-API.patch \
|
||||
file://0003-Fix-device-file-referance-to-dev-mei0-remove-select.patch \
|
||||
file://0004-Intel-AMT-ME-real-time-notification-infra.patch \
|
||||
"
|
||||
|
||||
FILES_${PN} += "${datadir}/xml/AMTAlerts.xml"
|
||||
|
||||
COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=ec77c894e8a1a89fa07aed2c76680ab8"
|
||||
|
||||
SRC_URI[md5sum] = "3cbd027a0e6e9ced8238478b24cde3c6"
|
||||
SRC_URI[sha256sum] = "7077db6f2f381e67cb37565b20c40ff0c7d3f98f014e65622a4b4b66c2b1d637"
|
||||
|
||||
inherit autotools update-rc.d
|
||||
|
||||
INITSCRIPT_NAME = "lms8"
|
||||
INITSCRIPT_PARAMS = "defaults"
|
||||
|
||||
|
||||
do_install_append () {
|
||||
mv ${D}/${sbindir}/lms ${D}/${sbindir}/lms8
|
||||
install -d ${D}${sysconfdir}/init.d
|
||||
# The configure script looks at the host to decide where to put init
|
||||
# scripts, so move it at the same time as renaming it.
|
||||
if test -f ${D}${sysconfdir}/rc.d/init.d/lms ; then
|
||||
mv ${D}${sysconfdir}/rc.d/init.d/lms ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
|
||||
else
|
||||
mv ${D}${sysconfdir}/init.d/lms ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
|
||||
fi
|
||||
sed -i 's/^NAME=lms/NAME=lms8/' ${D}${sysconfdir}/init.d/${INITSCRIPT_NAME}
|
||||
rmdir ${D}${datadir} || :
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user