diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-03-04 12:41:26 -0800 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-03-16 19:27:54 -0700 |
commit | 2bffd354ef005800955d05d2ce5b477f11103ff8 (patch) | |
tree | 67dfd6fc682d42572f17a4460a43dadec2cdedd7 | |
parent | 3c9af2142d30b38536742045fd1b8130b7c3ab64 (diff) | |
download | meta-openembedded-2bffd354ef005800955d05d2ce5b477f11103ff8.tar.gz |
tipcutils: Fix builds with kernel headers >= 4.15
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-oe/recipes-extended/tipcutils/tipcutils/0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch | 33 | ||||
-rw-r--r-- | meta-oe/recipes-extended/tipcutils/tipcutils_git.bb | 1 |
2 files changed, 34 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/tipcutils/tipcutils/0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch b/meta-oe/recipes-extended/tipcutils/tipcutils/0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch new file mode 100644 index 000000000..e49528505 --- /dev/null +++ b/meta-oe/recipes-extended/tipcutils/tipcutils/0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch | |||
@@ -0,0 +1,33 @@ | |||
1 | From 1ce892749e4f53bd0aeaa4c3ce45f80178799411 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 3 Mar 2018 17:52:51 -0800 | ||
4 | Subject: [PATCH] multicast_blast/tipcc: Fix struct type for TIPC_GROUP_JOIN | ||
5 | |||
6 | Kernel defines it as tipc_group_req and not tipc_mreq | ||
7 | this code was not excercised with older kernels so we | ||
8 | never ran into the compiler failures since TIPC_GROUP_JOIN | ||
9 | is only defined in kernel starting 4.15 | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | Upstream-Status: Pending | ||
14 | |||
15 | multicast_blast/tipcc.c | 2 +- | ||
16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
17 | |||
18 | diff --git a/multicast_blast/tipcc.c b/multicast_blast/tipcc.c | ||
19 | index 90644d3..911c759 100755 | ||
20 | --- a/multicast_blast/tipcc.c | ||
21 | +++ b/multicast_blast/tipcc.c | ||
22 | @@ -213,7 +213,7 @@ int tipc_accept(int sd, struct tipc_addr *src) | ||
23 | int tipc_join(int sd, struct tipc_addr *member) | ||
24 | { | ||
25 | #ifdef TIPC_GROUP_JOIN | ||
26 | - struct tipc_mreq mreq = { | ||
27 | + struct tipc_group_req mreq = { | ||
28 | .type = member->type, | ||
29 | .instance = member->instance, | ||
30 | .scope = domain2scope(member->domain) | ||
31 | -- | ||
32 | 2.16.2 | ||
33 | |||
diff --git a/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb b/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb index 720aa3c2b..54ed043f4 100644 --- a/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb +++ b/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb | |||
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://tipclog/tipc.h;endline=35;md5=985b6ea8735818511d276c1 | |||
5 | SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils \ | 5 | SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils \ |
6 | file://0001-include-sys-select.h-for-FD_-definitions.patch \ | 6 | file://0001-include-sys-select.h-for-FD_-definitions.patch \ |
7 | file://0002-replace-non-standard-uint-with-unsigned-int.patch \ | 7 | file://0002-replace-non-standard-uint-with-unsigned-int.patch \ |
8 | file://0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch \ | ||
8 | " | 9 | " |
9 | SRCREV = "7ab2211b87414ba240b0b2e4af219c1057c9cf9a" | 10 | SRCREV = "7ab2211b87414ba240b0b2e4af219c1057c9cf9a" |
10 | PV = "2.2.0+git${SRCPV}" | 11 | PV = "2.2.0+git${SRCPV}" |