diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2017-07-13 22:39:57 -0700 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-07-24 18:57:33 +0200 |
| commit | 77c757f414ac89742a5e7bc76ceecedd7a2eb01f (patch) | |
| tree | 93cf6ccc4fab77aecf490e289960a01fbf92b375 /meta-oe/recipes-support/libteam/libteam | |
| parent | cafe21e8a20610deffa3b79af223b939518ef9a8 (diff) | |
| download | meta-openembedded-contrib-77c757f414ac89742a5e7bc76ceecedd7a2eb01f.tar.gz | |
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>
Diffstat (limited to 'meta-oe/recipes-support/libteam/libteam')
2 files changed, 68 insertions, 0 deletions
diff --git a/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch b/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch new file mode 100644 index 0000000000..a4a17ed85b --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/0001-include-sys-select.h-for-fd_set-definition.patch @@ -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 + diff --git a/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch b/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch new file mode 100644 index 0000000000..beabf63ca3 --- /dev/null +++ b/meta-oe/recipes-support/libteam/libteam/0002-teamd-Re-adjust-include-header-order.patch @@ -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 + |