From patchwork Sun Mar 4 20:41:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 130594 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp1965022lja; Sun, 4 Mar 2018 12:41:49 -0800 (PST) X-Google-Smtp-Source: AG47ELvQjn4CVMPLskZpTV2ZtqyOkAXH0JK0LFRoZ3Q6XLiv7PEw8NVYM8OiR4HFoLYLHeFOyz3u X-Received: by 2002:a17:902:7608:: with SMTP id k8-v6mr10825933pll.95.1520196108974; Sun, 04 Mar 2018 12:41:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520196108; cv=none; d=google.com; s=arc-20160816; b=OUd2x3b/EUkMKnhVgZvE98YWqNC2PX7MlcJmu078habUIsXY1re+ijquNtuk5LCqsQ eX//KdI8+7VrZlGrfRcr5MutZ2toxVmSyvZvlU+1fSiVWYZDXFCNituYjVydB2Y8+FBc IoNEi4KEaRYKJlF883MmZOI4nf9Twvvy5wDpyhPRl23vgGFsEmAR2bxX06kDkoks8Ov7 7ECQGwn/iaX5sKdm/oYeTYwrpuTtiOuncZ5rC/A5+gd9voDdEJwoipOLfsrH/FRBLOTT UbyeRuTw7Oy5Mkr0JaDz18b/ALcoufV+JKy10ov6edMz4VCa0mSb9ZewlNQpDcHF8omk PX3g== 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:message-id:date:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=4ZKbYL3uN233ISu9ZOK9yCppYDlE4PRh9EH1WpN33MA=; b=gPDXyrM7twvCvRTOnWmpabEDoh3td/Mk7QK7ErL8Xb+6F971tTtMpSqXD583JST615 gs+3s8ehJIWRT4wK6a8ElkISEAAwEsEM8TEfp8Jcc4AkRfcoPnysGMsDG7Gei55+VH7m sPoI3sGCA9+W03YMejQfBBzosxl3J/GMHo2MknxPd0OgdXW15PHTlkcW7d2RB1Im+F5M CRDEo3dAOljeWkN0+J6iG8NKsKDabdHC7ubj3Lflrdq/1J9XV1l5o3gSwS9r7nVDgA6L F8esrdVmY2dUAJZ9jmBVh60HufMCc1+NwauUGwc3r2XY7REJOxogNTPQyoRihM5dYSJu LVCA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=bS9NNoDl; 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 11-v6si8175007plc.376.2018.03.04.12.41.47; Sun, 04 Mar 2018 12:41:48 -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=bS9NNoDl; 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 7A70A78972; Sun, 4 Mar 2018 20:41:42 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f45.google.com (mail-pl0-f45.google.com [209.85.160.45]) by mail.openembedded.org (Postfix) with ESMTP id C6EDA78972 for ; Sun, 4 Mar 2018 20:41:39 +0000 (UTC) Received: by mail-pl0-f45.google.com with SMTP id d9-v6so1037650plo.8 for ; Sun, 04 Mar 2018 12:41:41 -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; bh=+SHzjPpUO2rKJRkHnf8epXcTRmwZ7XaRUAbH5zil1BA=; b=bS9NNoDlWpB6B0VFhusOkU+pnYI2OPJgghYny8YvZJkxN0LSqxi41cyqd6bigUc4X4 NckerMiottFIW9ruOjDflU+GQ2OC2tLf69AZTEj92zlG1kBzT/ZlXJPlQXMyFUBdHNTd CSsslPEUSmWKzAFN+egM6ECsCrScDenGi6DsC1wxP1EyhLa/galEtLl1yOFn8YtbWzMf iloJjunAGsQ6kEfZvIFjp1BDyWuEMSapbGj5hBbuv00h/T43uReuT/0drnd1mWkMZSTx CUxHKQOODU5Fvxou89l4uXYg+tAXnt61xsuD9jctaYYM1JF3LM5g0VrEixlT9Gc0vXxm Scaw== 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; bh=+SHzjPpUO2rKJRkHnf8epXcTRmwZ7XaRUAbH5zil1BA=; b=Qa/sYehLl33NooKRSEc7qlUsXAYjcGUlBS3wtqhlfcIlYdSN/DkGsLPdwFfq+dYcYH KvzAjFcTR05cd5uSU7OJFE64EWh1Km4hbo6BnssXdcub44XOOh2JnnLPsR9PJNpzJX5J X/IWMh+KkzGiPZxfal4qHFpksdNDIidTbyhGml5LBjC3lIVz9IAMU1OY41YL2JOUTXCC a+S1LvwqxMMjITvvOBXIRF3aqaAmn0/vSSRVHdhN+ecuVHxTGmfY73ZyT8ZGGf+4aUrs YUkleTMyXhZR9xGKCmGe8lY7Lm3ZJwJBsvJECzQMLkWOhB4PoF79hfUGjTxRLg4mUTOm UdAw== X-Gm-Message-State: APf1xPC9L3rivP7O/MTczHVb/TJuIPKQuJXg3gYwzXn4nQ0v3wXDXXJp xdoo0zPf3PUUSH3MEcpreDJ/fw== X-Received: by 2002:a17:902:b10b:: with SMTP id q11-v6mr11084738plr.275.1520196100696; Sun, 04 Mar 2018 12:41:40 -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.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 04 Mar 2018 12:41:39 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 4 Mar 2018 12:41:24 -0800 Message-Id: <20180304204130.23962-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.16.2 Subject: [oe] [meta-networking][PATCH 1/7] ebtables: Fix duplicate definition errors due to netinet/ether.h 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 --- .../0001-re-order-including-netinet-ether.h.patch | 89 ++++++++++++++++++++++ .../recipes-filter/ebtables/ebtables_2.0.10-4.bb | 1 + 2 files changed, 90 insertions(+) create mode 100644 meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-re-order-including-netinet-ether.h.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-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-re-order-including-netinet-ether.h.patch b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-re-order-including-netinet-ether.h.patch new file mode 100644 index 000000000..997c8c5d1 --- /dev/null +++ b/meta-networking/recipes-filter/ebtables/ebtables-2.0.10-4/0001-re-order-including-netinet-ether.h.patch @@ -0,0 +1,89 @@ +From 65e6ce454751b0d38d29836fcf78a31b612e59c3 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 3 Mar 2018 16:38:17 -0800 +Subject: [PATCH] re-order including netinet/ether.h + +Fixed duplicate definitions errors seen with glibc 2.27 + +e.g. + +error: redefinition of 'struct sockaddr_in6' +| struct sockaddr_in6 { + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + extensions/ebt_among.c | 3 +-- + extensions/ebt_arpreply.c | 2 +- + extensions/ebt_nat.c | 2 +- + useful_functions.c | 2 +- + 4 files changed, 4 insertions(+), 5 deletions(-) + +diff --git a/extensions/ebt_among.c b/extensions/ebt_among.c +index b096847..e03a4e2 100644 +--- a/extensions/ebt_among.c ++++ b/extensions/ebt_among.c +@@ -12,10 +12,9 @@ + #include + #include + #include +-#include + #include "../include/ebtables_u.h" + #include "../include/ethernetdb.h" +-#include ++#include + #include + #include + #include +diff --git a/extensions/ebt_arpreply.c b/extensions/ebt_arpreply.c +index c5102a4..c3757f3 100644 +--- a/extensions/ebt_arpreply.c ++++ b/extensions/ebt_arpreply.c +@@ -11,8 +11,8 @@ + #include + #include + #include +-#include + #include "../include/ebtables_u.h" ++#include + #include + + static int mac_supplied; +diff --git a/extensions/ebt_nat.c b/extensions/ebt_nat.c +index 8d318d1..e6afbf8 100644 +--- a/extensions/ebt_nat.c ++++ b/extensions/ebt_nat.c +@@ -10,8 +10,8 @@ + #include + #include + #include +-#include + #include "../include/ebtables_u.h" ++#include + #include + + static int to_source_supplied, to_dest_supplied; +diff --git a/useful_functions.c b/useful_functions.c +index c304f4d..a447db5 100644 +--- a/useful_functions.c ++++ b/useful_functions.c +@@ -23,7 +23,6 @@ + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + #include +-#include + #include + #include + #include +@@ -33,6 +32,7 @@ + #include + #include "include/ebtables_u.h" + #include "include/ethernetdb.h" ++#include + + const unsigned char mac_type_unicast[ETH_ALEN] = {0,0,0,0,0,0}; + const unsigned char msk_type_unicast[ETH_ALEN] = {1,0,0,0,0,0}; +-- +2.16.2 + diff --git a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb index d5e7341a0..7c89cffa9 100644 --- a/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb +++ b/meta-networking/recipes-filter/ebtables/ebtables_2.0.10-4.bb @@ -30,6 +30,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/ebtables/ebtables-v${PV}.tar.gz \ file://0008-ethernetdb.h-Remove-C-specific-compiler-hint-macro-_.patch \ file://0009-ebtables-Allow-RETURN-target-rules-in-user-defined-c.patch \ file://0010-Adjust-header-include-sequence.patch \ + file://0001-re-order-including-netinet-ether.h.patch \ " SRC_URI[md5sum] = "506742a3d44b9925955425a659c1a8d0"