From 2bffd354ef005800955d05d2ce5b477f11103ff8 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 4 Mar 2018 12:41:26 -0800 Subject: tipcutils: Fix builds with kernel headers >= 4.15 Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- ...last-tipcc-Fix-struct-type-for-TIPC_GROUP.patch | 33 ++++++++++++++++++++++ .../recipes-extended/tipcutils/tipcutils_git.bb | 1 + 2 files changed, 34 insertions(+) create mode 100644 meta-oe/recipes-extended/tipcutils/tipcutils/0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch 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 @@ +From 1ce892749e4f53bd0aeaa4c3ce45f80178799411 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 3 Mar 2018 17:52:51 -0800 +Subject: [PATCH] multicast_blast/tipcc: Fix struct type for TIPC_GROUP_JOIN + +Kernel defines it as tipc_group_req and not tipc_mreq +this code was not excercised with older kernels so we +never ran into the compiler failures since TIPC_GROUP_JOIN +is only defined in kernel starting 4.15 + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + multicast_blast/tipcc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/multicast_blast/tipcc.c b/multicast_blast/tipcc.c +index 90644d3..911c759 100755 +--- a/multicast_blast/tipcc.c ++++ b/multicast_blast/tipcc.c +@@ -213,7 +213,7 @@ int tipc_accept(int sd, struct tipc_addr *src) + int tipc_join(int sd, struct tipc_addr *member) + { + #ifdef TIPC_GROUP_JOIN +- struct tipc_mreq mreq = { ++ struct tipc_group_req mreq = { + .type = member->type, + .instance = member->instance, + .scope = domain2scope(member->domain) +-- +2.16.2 + 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 SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils \ file://0001-include-sys-select.h-for-FD_-definitions.patch \ file://0002-replace-non-standard-uint-with-unsigned-int.patch \ + file://0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch \ " SRCREV = "7ab2211b87414ba240b0b2e4af219c1057c9cf9a" PV = "2.2.0+git${SRCPV}" -- cgit v1.2.3-54-g00ecf