libiec61850: Upgrade to 1.5.0

Remove all upstream patches
Rename patch 0003 -> 0001

Signed-off-by: Romain Naour <romain.naour@smile.fr>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Romain Naour 2021-05-25 17:14:56 +02:00 committed by Khem Raj
parent 17c3855aac
commit 6c2a802f42
4 changed files with 5 additions and 72 deletions

View File

@ -1,4 +1,4 @@
From 89f326a427c7ad13c115e2d3f2ac27807aa5a795 Mon Sep 17 00:00:00 2001
From d4ddfc7a350011b7944ed8d6bca80f164dfd1387 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@smile.fr>
Date: Fri, 10 Jul 2020 17:08:34 +0200
Subject: [PATCH] pyiec61850: don't break CMAKE_INSTALL_PATH by trying to find
@ -33,5 +33,5 @@ index 159ef4b..d1732a1 100644
add_test(test_pyiec61850 ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_LIST_DIR}/test_pyiec61850.py)
--
2.21.3
2.31.1

View File

@ -1,33 +0,0 @@
From 4cad505fc98240eb66eaabfae61a9694f8158dda Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@smile.fr>
Date: Tue, 7 Apr 2020 20:58:37 +0200
Subject: [PATCH] use <poll.h> instead of <sys/poll.h>
The manpage of poll(2) states that the prototype of poll is defined
in <poll.h>. Use that header file instead of <sys/poll.h> to allow
compilation against musl-libc.
Upstream status: Pending
https://github.com/mz-automation/libiec61850/pull/228
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
hal/ethernet/linux/ethernet_linux.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hal/ethernet/linux/ethernet_linux.c b/hal/ethernet/linux/ethernet_linux.c
index c3ab2e2..9aa5c28 100644
--- a/hal/ethernet/linux/ethernet_linux.c
+++ b/hal/ethernet/linux/ethernet_linux.c
@@ -23,7 +23,7 @@
#include <sys/socket.h>
#include <sys/ioctl.h>
-#include <sys/poll.h>
+#include <poll.h>
#include <linux/if_packet.h>
#include <linux/if_ether.h>
#include <linux/if_arp.h>
--
2.21.1

View File

@ -1,32 +0,0 @@
From 661405eb6066b67dfe51d5ff9635e29f86bdd238 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@smile.fr>
Date: Tue, 7 Apr 2020 21:02:54 +0200
Subject: [PATCH] serial_port_linux: Add missing include sys/time.h
POSIX says `struct timeval` is defined if <sys/time.h> is included.
Adding this header allow to build against musl-libc.
Upstream status: Pending
https://github.com/mz-automation/libiec61850/pull/228
Signed-off-by: Romain Naour <romain.naour@smile.fr>
---
hal/serial/linux/serial_port_linux.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/hal/serial/linux/serial_port_linux.c b/hal/serial/linux/serial_port_linux.c
index e6308c0..15e5794 100644
--- a/hal/serial/linux/serial_port_linux.c
+++ b/hal/serial/linux/serial_port_linux.c
@@ -29,6 +29,7 @@
#include <termios.h>
#include <fcntl.h>
#include <unistd.h>
+#include <sys/time.h>
#include "hal_serial.h"
#include "hal_time.h"
--
2.21.1

View File

@ -13,12 +13,10 @@ SECTION = "console/network"
LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
DEPENDS = "swig-native python3"
SRCREV = "d798814fb463115a835da597535a625b68a39cff"
SRCREV = "fcefc746fea286aeaa40d2f62240216da81c85e5"
SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.4 \
file://0001-use-poll.h-instead-of-sys-poll.h.patch \
file://0002-serial_port_linux-Add-missing-include-sys-time.h.patch \
file://0003-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \
SRC_URI = "git://github.com/mz-automation/${BPN}.git;branch=v1.5 \
file://0001-pyiec61850-don-t-break-CMAKE_INSTALL_PATH-by-trying-.patch \
"
S = "${WORKDIR}/git"