mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
libteam: Upgrade to 1.27
Fix build with musl Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
cafe21e8a2
commit
77c757f414
|
|
@ -0,0 +1,28 @@
|
|||
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>
|
||||
---
|
||||
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
|
||||
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
From a5b945cb3c62a18dcd7047f62707c09076c4e48b Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Wed, 12 Jul 2017 15:35:51 -0700
|
||||
Subject: [PATCH 2/2] teamd: Re-adjust include header order
|
||||
|
||||
So it gets the library definition before kernel definition
|
||||
|
||||
usr/include/ne
|
||||
tinet/if_ether.h:101:8: error: redefinition of 'struct ethhdr'
|
||||
struct ethhdr {
|
||||
^~~~~~
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
teamd/teamd_runner_lacp.c | 2 +-
|
||||
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
|
||||
+++ b/teamd/teamd_runner_lacp.c
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <unistd.h>
|
||||
#include <limits.h>
|
||||
#include <sys/ioctl.h>
|
||||
+#include <net/ethernet.h>
|
||||
#include <linux/if_ether.h>
|
||||
#include <sys/socket.h>
|
||||
#include <linux/netdevice.h>
|
||||
@@ -30,7 +31,6 @@
|
||||
#include <errno.h>
|
||||
#include <team.h>
|
||||
#include <private/misc.h>
|
||||
-#include <net/ethernet.h>
|
||||
|
||||
#include "teamd.h"
|
||||
#include "teamd_config.h"
|
||||
--
|
||||
2.13.2
|
||||
|
||||
|
|
@ -7,8 +7,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
|
|||
|
||||
DEPENDS = "libnl libdaemon jansson"
|
||||
|
||||
SRC_URI = "git://github.com/jpirko/libteam"
|
||||
SRCREV = "8c1cea00a21950089058e4e33ea1f7bf4deaddeb"
|
||||
SRC_URI = "git://github.com/jpirko/libteam \
|
||||
file://0001-include-sys-select.h-for-fd_set-definition.patch \
|
||||
file://0002-teamd-Re-adjust-include-header-order.patch \
|
||||
"
|
||||
SRCREV = "91a928a56a501daac5ce8b3c16bd9943661f1d16"
|
||||
|
||||
SRC_URI[md5sum] = "565114d70c41bff6093d8e57be284e8a"
|
||||
SRC_URI[sha256sum] = "d65286379141db141bea33424ec0507bb0f827a0bf03d9c65004bb593e3d5545"
|
||||
Loading…
Reference in New Issue
Block a user