mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-09-29 08:26:39 +00:00
libteam: Upgrade to 1.32 release
Drop upstreamed patches Fix build with GCC-14 on musl systems Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
f25bfcbf94
commit
9e91609444
@ -1,30 +0,0 @@
|
|||||||
From 0ab69dc18a2057ff5bf41abcdf2b983b72d5a903 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Wed, 12 Jul 2017 15:34:49 -0700
|
|
||||||
Subject: [PATCH 1/2] include sys/select.h for fd_set definition
|
|
||||||
|
|
||||||
Fixes
|
|
||||||
teamnl.c:160:2: error: unknown type name 'fd_set'; did you mean 'fpos_t'?
|
|
||||||
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
Upstream-Status: Pending
|
|
||||||
|
|
||||||
utils/teamnl.c | 1 +
|
|
||||||
1 file changed, 1 insertion(+)
|
|
||||||
|
|
||||||
diff --git a/utils/teamnl.c b/utils/teamnl.c
|
|
||||||
index e8de7e2..25129e8 100644
|
|
||||||
--- a/utils/teamnl.c
|
|
||||||
+++ b/utils/teamnl.c
|
|
||||||
@@ -24,6 +24,7 @@
|
|
||||||
#include <getopt.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <sys/signalfd.h>
|
|
||||||
+#include <sys/select.h>
|
|
||||||
#include <signal.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <team.h>
|
|
||||||
--
|
|
||||||
2.13.2
|
|
||||||
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
From 49693cac37ee35ff673240c8060201efe0d999c2 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Date: Wed, 24 Aug 2022 22:27:03 -0700
|
|
||||||
Subject: [PATCH] teamd: Include missing headers for strrchr and memcmp
|
|
||||||
|
|
||||||
Compiler does not see the prototype for these functions otherwise and
|
|
||||||
build fails e.g.
|
|
||||||
|
|
||||||
| ../../git/teamd/teamd_phys_port_check.c:52:10: error: call to undeclared library function 'strrchr' with type 'char *(const char *, int)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
|
|
||||||
| start = strrchr(link, '/');
|
|
||||||
| ^
|
|
||||||
|
|
||||||
Upstream-Status: Submitted [https://github.com/jpirko/libteam/pull/68]
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
teamd/teamd_phys_port_check.c | 1 +
|
|
||||||
teamd/teamd_runner_loadbalance.c | 1 +
|
|
||||||
2 files changed, 2 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/teamd/teamd_phys_port_check.c b/teamd/teamd_phys_port_check.c
|
|
||||||
index 1eec129..c2454ab 100644
|
|
||||||
--- a/teamd/teamd_phys_port_check.c
|
|
||||||
+++ b/teamd/teamd_phys_port_check.c
|
|
||||||
@@ -19,6 +19,7 @@
|
|
||||||
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <errno.h>
|
|
||||||
+#include <string.h>
|
|
||||||
#include <sys/types.h>
|
|
||||||
#include <sys/stat.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
diff --git a/teamd/teamd_runner_loadbalance.c b/teamd/teamd_runner_loadbalance.c
|
|
||||||
index a581472..421a7c6 100644
|
|
||||||
--- a/teamd/teamd_runner_loadbalance.c
|
|
||||||
+++ b/teamd/teamd_runner_loadbalance.c
|
|
||||||
@@ -17,6 +17,7 @@
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
+#include <string.h>
|
|
||||||
#include <sys/socket.h>
|
|
||||||
#include <linux/netdevice.h>
|
|
||||||
#include <team.h>
|
|
||||||
--
|
|
||||||
2.37.2
|
|
||||||
|
|
||||||
@ -0,0 +1,39 @@
|
|||||||
|
From e6ba4c16da808e47891241452a927b7f558a6420 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Khem Raj <raj.khem@gmail.com>
|
||||||
|
Date: Sat, 11 May 2024 23:11:22 -0700
|
||||||
|
Subject: [patch libteam] teamd: Pass correct parameter type to accept API
|
||||||
|
|
||||||
|
accept() expects sockaddr as second parameter
|
||||||
|
|
||||||
|
int accept (int, struct sockaddr *__restrict, socklen_t *__restrict);
|
||||||
|
|
||||||
|
Fixes build with gcc-16 on musl systems
|
||||||
|
| ../../git/teamd/teamd_usock.c: In function 'callback_usock':
|
||||||
|
| ../../git/teamd/teamd_usock.c:280:40: error: passing argument 2 of 'accept' from incompatible pointer type [-Wincompatible-pointer-types]
|
||||||
|
| 280 | sock = accept(ctx->usock.sock, &addr, &alen);
|
||||||
|
| | ^~~~~
|
||||||
|
| | |
|
||||||
|
| | struct sockaddr_un *
|
||||||
|
|
||||||
|
Upstream-Status: Submitted [https://lists.fedorahosted.org/archives/list/libteam@lists.fedorahosted.org/2024/5/]
|
||||||
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||||
|
---
|
||||||
|
teamd/teamd_usock.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/teamd/teamd_usock.c b/teamd/teamd_usock.c
|
||||||
|
index 1adfdf8..5895124 100644
|
||||||
|
--- a/teamd/teamd_usock.c
|
||||||
|
+++ b/teamd/teamd_usock.c
|
||||||
|
@@ -277,7 +277,7 @@ static int callback_usock(struct teamd_context *ctx, int events, void *priv)
|
||||||
|
int err;
|
||||||
|
|
||||||
|
alen = sizeof(addr);
|
||||||
|
- sock = accept(ctx->usock.sock, &addr, &alen);
|
||||||
|
+ sock = accept(ctx->usock.sock, (struct sockaddr *)&addr, &alen);
|
||||||
|
if (sock == -1) {
|
||||||
|
teamd_log_err("usock: Failed to accept connection.");
|
||||||
|
return -errno;
|
||||||
|
--
|
||||||
|
2.45.0
|
||||||
|
|
||||||
@ -17,19 +17,15 @@ Upstream-Status: Pending
|
|||||||
teamd/teamd_runner_lacp.c | 2 +-
|
teamd/teamd_runner_lacp.c | 2 +-
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/teamd/teamd_runner_lacp.c b/teamd/teamd_runner_lacp.c
|
|
||||||
index 9c77fae..8800854 100644
|
|
||||||
--- a/teamd/teamd_runner_lacp.c
|
--- a/teamd/teamd_runner_lacp.c
|
||||||
+++ b/teamd/teamd_runner_lacp.c
|
+++ b/teamd/teamd_runner_lacp.c
|
||||||
@@ -23,6 +23,7 @@
|
@@ -23,12 +23,12 @@
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#include <sys/ioctl.h>
|
#include <sys/ioctl.h>
|
||||||
+#include <net/ethernet.h>
|
+#include <net/ethernet.h>
|
||||||
#include <linux/if_ether.h>
|
|
||||||
#include <sys/socket.h>
|
#include <sys/socket.h>
|
||||||
#include <linux/netdevice.h>
|
#include <netinet/in.h>
|
||||||
@@ -30,7 +31,6 @@
|
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <team.h>
|
#include <team.h>
|
||||||
#include <private/misc.h>
|
#include <private/misc.h>
|
||||||
@ -37,6 +33,3 @@ index 9c77fae..8800854 100644
|
|||||||
|
|
||||||
#include "teamd.h"
|
#include "teamd.h"
|
||||||
#include "teamd_config.h"
|
#include "teamd_config.h"
|
||||||
--
|
|
||||||
2.13.2
|
|
||||||
|
|
||||||
|
|||||||
@ -8,15 +8,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
|
|||||||
DEPENDS = "libnl libdaemon jansson"
|
DEPENDS = "libnl libdaemon jansson"
|
||||||
|
|
||||||
SRC_URI = "git://github.com/jpirko/libteam;branch=master;protocol=https \
|
SRC_URI = "git://github.com/jpirko/libteam;branch=master;protocol=https \
|
||||||
file://0001-include-sys-select.h-for-fd_set-definition.patch \
|
|
||||||
file://0002-teamd-Re-adjust-include-header-order.patch \
|
file://0002-teamd-Re-adjust-include-header-order.patch \
|
||||||
file://0001-team_basic_test.py-disable-RedHat-specific-test.patch \
|
file://0001-team_basic_test.py-disable-RedHat-specific-test.patch \
|
||||||
file://0001-team_basic_test.py-switch-to-python3.patch \
|
file://0001-team_basic_test.py-switch-to-python3.patch \
|
||||||
file://0001-team_basic_test.py-check-the-return-value.patch \
|
file://0001-team_basic_test.py-check-the-return-value.patch \
|
||||||
file://0001-teamd-Include-missing-headers-for-strrchr-and-memcmp.patch \
|
file://0001-teamd-Pass-correct-parameter-type-to-accept-API.patch \
|
||||||
file://run-ptest \
|
file://run-ptest \
|
||||||
"
|
"
|
||||||
SRCREV = "3ee12c6d569977cf1cd30d0da77807a07aa77158"
|
SRCREV = "8b843e93cee1dab61fb79b01791201cdad45e1d1"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user