From patchwork Sun Mar 4 20:41:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 130596 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1965446lja; Sun, 4 Mar 2018 12:42:23 -0800 (PST) X-Google-Smtp-Source: AG47ELvLn8+rG7zcIYbw/PXfPjw5UVQ9UmN1MWku9qSnrf1FYBiMDMxSen7RyNpYUcqQPgkTDEzZ X-Received: by 10.98.242.65 with SMTP id y1mr12755988pfl.232.1520196143693; Sun, 04 Mar 2018 12:42:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520196143; cv=none; d=google.com; s=arc-20160816; b=A/m7bl/7CW6v433pnTGj+mun9NRlYLJTkLEWBWmSdw9ls475zNZqa3FiFp8z0XEtIM 8k+6jkPw46sbSQl7SdKdARHNTo6JJWiV1YtTTipWHJnXn4G2c8KOg1rr0SmHfypFRhy1 y/rLmNP2kiTaoHbVmM7RuRwVBT0ST1wAFtnAPNtVOmwBmWEwO1JihI0BKj5a6D7ej5VA O1dfdZCx2eJ9jiuxjNaKLn6HoccMJt45FsGwLoVjiDyr8GhqVxE9kc5tqHE/zFEHa1Sh 95bCwDeaD4Bbouc3WC8AvzOKyCz4Y+NeQcO1YQRLJWEJpiEusG6XJydaHlZUiS8aYR5J F6oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=znyAaCH6zzT/fS7nVzQO2SD6VH10cj82wbwS52xhBXk=; b=t7YWCuC3m8qEKRoCin6fPBskiA0oNPZYnak4ArWOejQH89b/teLUmIhBdikZklNe1D zx7M4SV9sG4wk1eamnd9Tf+kP6BuYi3kJ7JJsTLpSqJTKEvWAR5T/JvBc5ykX5hQAbsC rp2gPRJrS+7FnKEzKCDOuK0A4GFBnxfDb2JIrPDBvPAULLDjRGeJbwArOCDoCtEWaU2l cjg+nwizRJkzdk/5d6PIgJc4sugmpTRrneIs2tMemCLUCAbm0ap+EhPrGxWaA31i/yo3 QiaLcn8Yd55Wd/PlBzcaOl88chasxGFlK/bPrN7+rhXuRyjy5xTiQzgfXwGGyONkXZtp XIbA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=AOSrhz/E; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id d67si8963820pfe.49.2018.03.04.12.42.23; Sun, 04 Mar 2018 12:42:23 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=AOSrhz/E; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A473F78AA4; Sun, 4 Mar 2018 20:42:16 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by mail.openembedded.org (Postfix) with ESMTP id 8D57D78A8A for ; Sun, 4 Mar 2018 20:41:43 +0000 (UTC) Received: by mail-pl0-f68.google.com with SMTP id y8-v6so8508032pll.13 for ; Sun, 04 Mar 2018 12:41:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZYAyBYHUatk/bYiCdoRDT7obOn5QWvJs8kTqSwCaA/A=; b=AOSrhz/Eb0X50c2Eu01OwphhCVJ0fd4Z9Zd6pEOXW3SMalyXIkR7LrNUnezM8LVWVn nH55StxR+IU0xyj7nu3BW1pfcgRpmXs06QkLEN9F3C+hkiwF3YPGeEZdao1mRjdZETwN 1WIXNDZMN+Ifs18fxscFvyNVyf3yLVvgk3D55wbxLZatagtuguCZfri7B0k2cEtSfsBt tZMvuBfrFsDdRHDYB4jwBN/0zTGTvgasHgfIybO/aC7YfckQjl+a0Bcjeodqe2TfY/wg glSoRHMzjmavaM0TLabAjFIXykbsKRjgT1UEghYjAjPw8gDZEMv/lggGCOxPa8nnxdoD oVsQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZYAyBYHUatk/bYiCdoRDT7obOn5QWvJs8kTqSwCaA/A=; b=IOi5Io2bec2gbdk6Z98cZOaVs/GsX+GxZ7sVGSLtXZvdx/vh1f8nH2M/h8LQEFEkQY 6IsEAQyYsdhUQC9xWmxFFDUP7qmaqrjDkzNwIuS+KVlesSgRrm4yBW58GG6jvFo4dP0T paP62NGyH7FBPUfdInVg9e4usSsggwngH7zdT+ig4/MYx8OHhfwS11lRZBpGoST90T3U EOgKKPY4YCDxJDBANiAtBw3aEMm3nx8k4d2lzQmj3DqZNIQIfe3zImnqpgT41fCcUc+M cC+yj8fygrLENBYygp0tBAR85YRMi0nzZAsFx8NXIJ2H7kNGouigx+go58U4zhlCDr5X yJJA== X-Gm-Message-State: APf1xPCZAi3K972WaRrqXIbStHgH3cDYiySejX36d72i86gYPQy0IARu 0j2mqwkWIu4iJckjOpnubvt6Hw== X-Received: by 2002:a17:902:40a:: with SMTP id 10-v6mr11050738ple.245.1520196105277; Sun, 04 Mar 2018 12:41:45 -0800 (PST) Received: from localhost.localdomain ([2601:646:8880:466c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id u28sm22943090pfl.19.2018.03.04.12.41.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Mar 2018 12:41:43 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 4 Mar 2018 12:41:26 -0800 Message-Id: <20180304204130.23962-3-raj.khem@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180304204130.23962-1-raj.khem@gmail.com> References: <20180304204130.23962-1-raj.khem@gmail.com> Subject: [oe] [meta-oe][PATCH 3/7] tipcutils: Fix builds with kernel headers >= 4.15 X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Signed-off-by: Khem Raj --- ...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 -- 2.16.2 -- _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel 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}"