From patchwork Mon Mar 19 06:02:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 132003 Delivered-To: patch@linaro.org Received: by 10.46.84.17 with SMTP id i17csp2341817ljb; Sun, 18 Mar 2018 23:04:41 -0700 (PDT) X-Google-Smtp-Source: AG47ELsAoe0WPk9/wtYCFe92NjNeqLxqZe7UvUiuYZ3w8lvwRnQ4I5F/a9Y3kN9EnWjVyimeHRx7 X-Received: by 10.99.52.11 with SMTP id b11mr8049688pga.377.1521439481611; Sun, 18 Mar 2018 23:04:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521439481; cv=none; d=google.com; s=arc-20160816; b=mb0UDuvmCq+wrcGUXb5ZyWP3k/drumLTtCLCbAPEfmXrowjjL6jb5JqE1wxIjbn18v q6TeWRrfLkOC6j4epbxoZ6QgDPi1ULPsgVVzLAezAfKSD3dlGINMpbGMYfUg0NcdSSsN kSvNco78w3YF/pi0CsybA1DNL21y+xAvfPsWEA4r4aGb5mSdb092qyuNmHfx7K4xznMS GwAxFoFERY3oWRlWnhu19saQtmU6GlFQGXOtx0Yq9NPjkIaMrMhIt0JsRquCWjwJ+xVW 8kfG3o+Nw9ulcj9Vwb3DLCuRSBE+d7CfgU553+Tq3uIEYIK3b7HDyMd6GRa8w/3WqwUY qI1g== 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=E3nND9HmVK+z1QFe9p+R6N9V9d5DKDEC7Gvu0Pai0iY=; b=cJO6zg+MECtVX4lAVeNftC8hDPwrDe0Dpd1Sgq6v4H+tQrAMhiQ5JSp3rv8r3hUDiB vy7h+Tg69rzZQm+nG4Mp1j25mfLGQKHh/vFjYSlsfv9O4IYpnJayI6hM0A4HSk6iZf55 0IQXOohdfQmuaDD36ebtdO8pQoOanVJfbvjMPd/6C656i3arNNb4K6ya0+dpIdG8947i NNgN5+ZjSMDa/y5T5x4NllNnP2TL6eKzUpXVPw9nrv/1Uz6Aw9DnS3Jm1Y2wvTxDVs2Z hznQ/VXjNHzjoVPU/X71j2q7T5ScgXsu4qN+31LIN4hThSlEEeqsW3jH+xr1lqlf1i6R X3uw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=lW9HIz/Z; 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 e129si5609662pfe.87.2018.03.18.23.04.41; Sun, 18 Mar 2018 23:04:41 -0700 (PDT) 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=lW9HIz/Z; 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 46DC37896F; Mon, 19 Mar 2018 06:04:00 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl0-f53.google.com (mail-pl0-f53.google.com [209.85.160.53]) by mail.openembedded.org (Postfix) with ESMTP id 7FFD47893C for ; Mon, 19 Mar 2018 06:03:22 +0000 (UTC) Received: by mail-pl0-f53.google.com with SMTP id 61-v6so9645015plf.3 for ; Sun, 18 Mar 2018 23:03:24 -0700 (PDT) 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=dDQ9BbNA313EyG6XbLry4yFh6L7v+rQQAZDtQEd4k04=; b=lW9HIz/Zv60/f0fQPYPQz/082DRhxoEqlFO+8fharB6Rq86hTuwIpTW3QczhZjRg7v 38osj09w46CCBIMo4B4V7RgQScHF9SjvY/GuLUhXlFuGK1WO7xKHNf2AnyORfjfkIFM3 vOJcKgOYCGtPjJ9+oiyLd1mWSk2p/ikNl476esD4BPSEU3Ea+ovF4bDcMsWoIJXct0re BCGav69ZPjYrjbvRd98+lcnczu/DbbqwJeu39Yrv+U/LDQGAUZXyDllzrruGCrOdYevB vMgKjg92IItMZGXTsdjuZZ9GH+r1TXiLX6hrOyXyNmhBD2Hckt7xujDhW23lPg6V+pyo 6TKA== 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=dDQ9BbNA313EyG6XbLry4yFh6L7v+rQQAZDtQEd4k04=; b=Sk3UK3y8P3jgHuMwdzL4n/GPlkB3Mb/jmWaML4PrCfrixX13hT7AR3Jx1OGb3xocKp 1b49XCYRQRXsg/XjfGgvAWKv6ZXkvDs88u4/b+V542ZBh9d0QskXrhp1Pc2zmBWuf2PQ XVNsg130bq7dvRi4K9pIBk/HRNjujaBj3T38hv2DfzcakwBubEPlHdVOdnyrobahTjes 7GpEIazkeBhVwSdwgujOqvw636fMDF/pFWGnH59xN9hVzRQSwhs2upmNGVMvlFMDyUXW eKPzsEC0q9szOF2QaGmRM374JXIPllWTtIYh1Dq0ZAHpImMXypTqIwR/+eBou3eRd09m u0Cw== X-Gm-Message-State: AElRT7G+z6AbMjJTi2rCjv8PAiauIhg0HZ68eXdVQDMeV0etlH1Na6iI w0Vj3lw8BOXMcpur+tJ04G4cXQ== X-Received: by 2002:a17:902:820a:: with SMTP id x10-v6mr713555pln.105.1521439403481; Sun, 18 Mar 2018 23:03:23 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8880:466c:6245:cbff:fe64:591]) by smtp.gmail.com with ESMTPSA id a22sm5047426pgw.10.2018.03.18.23.03.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 18 Mar 2018 23:03:22 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Sun, 18 Mar 2018 23:02:50 -0700 Message-Id: <20180319060300.5366-8-raj.khem@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180319060300.5366-1-raj.khem@gmail.com> References: <20180319060300.5366-1-raj.khem@gmail.com> Subject: [oe] [meta-networking][PATCH 08/18] openl2tp: Fix build due to duplicate net/ headers 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 --- ...api.c-include-rpc-clnt.h-for-resultproc_t.patch | 7 ++--- ...0001-plugins-Remove-redundant-net-headers.patch | 31 ++++++++++++++++++++++ .../openl2tp/0002-user-ipv6-structures.patch | 7 ++--- ...linux-kernel-headers-assumptions-on-glibc.patch | 9 ++++--- .../recipes-protocols/openl2tp/openl2tp_1.8.bb | 1 + 5 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 meta-networking/recipes-protocols/openl2tp/openl2tp/0001-plugins-Remove-redundant-net-headers.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-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch index a11a97ebd..a72256f19 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-l2tp_api.c-include-rpc-clnt.h-for-resultproc_t.patch @@ -1,13 +1,14 @@ -From 8f299df4dd1ca857e34859c377a29b183c630961 Mon Sep 17 00:00:00 2001 +From b7f146caf28a80ada3d45bb9903890e6dfdd5e85 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 21 Sep 2017 13:05:03 -0700 -Subject: [PATCH] l2tp_api.c: include rpc/clnt.h for 'resultproc_t' +Subject: [PATCH 4/4] l2tp_api.c: include rpc/clnt.h for 'resultproc_t' Fixes | /mnt/a/oe/build/tmp/work/mips32r2-bec-linux-musl/openl2tp/1.8-r0/recipe-sysroot/usr/include/tirpc/rpc/pmap_clnt.h:81:12: error: unknown type name 'resultproc_t'; did you mean 'rpcproc_t'? | resultproc_t); | ^~~~~~~~~~~~ Signed-off-by: Khem Raj + --- Upstream-Status: Pending @@ -27,5 +28,5 @@ index f0946fd..f77881c 100644 //#include -- -2.14.1 +2.16.2 diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-plugins-Remove-redundant-net-headers.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-plugins-Remove-redundant-net-headers.patch new file mode 100644 index 000000000..0276c6648 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0001-plugins-Remove-redundant-net-headers.patch @@ -0,0 +1,31 @@ +From 343994e7f121bba7f16aa3b5e9c27b5aed7d1b99 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 3 Mar 2018 16:50:03 -0800 +Subject: [PATCH] plugins: Remove redundant net/ headers + +They cause errors with glibc 2.27 + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + plugins/ppp_unix.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/plugins/ppp_unix.c b/plugins/ppp_unix.c +index 869066f..6a20b1a 100644 +--- a/plugins/ppp_unix.c ++++ b/plugins/ppp_unix.c +@@ -25,9 +25,6 @@ + #include + #include + #include +-#include +-#include +-#include + #include + #include + #include +-- +2.16.2 + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch index 3f8bcaa48..abb09be8a 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0002-user-ipv6-structures.patch @@ -1,9 +1,10 @@ -From a41cbeee3cf660663a9baac80545050a8d960898 Mon Sep 17 00:00:00 2001 +From 200b72d2dd7ff05466938c00baf055dbe7779866 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 28 Mar 2017 18:09:58 -0700 -Subject: [PATCH 2/2] user ipv6 structures +Subject: [PATCH 3/4] user ipv6 structures Signed-off-by: Khem Raj + --- l2tp_api.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) @@ -29,5 +30,5 @@ index 9d6f60a..f0946fd 100644 svcerr_auth(xprt, AUTH_TOOWEAK); return -EPERM; -- -2.12.1 +2.16.2 diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch index 0fcba6546..ab5b22e01 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/0004-Adjust-for-linux-kernel-headers-assumptions-on-glibc.patch @@ -1,7 +1,7 @@ -From ede4ae8e25f9fb746a6f4e076d0ef029938d2880 Mon Sep 17 00:00:00 2001 +From 78f774faff6bd27c378c59e6685ac9b4db68c7bb Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 28 Mar 2017 11:46:56 -0700 -Subject: [PATCH 4/4] Adjust for linux-kernel headers assumptions on glibc +Subject: [PATCH 2/4] Adjust for linux-kernel headers assumptions on glibc Fixes build issues e.g. @@ -11,12 +11,13 @@ In file included from /mnt/a/build/tmp-musl/work/cortexa7hf-neon-vfpv4-oe-linux- ^ Signed-off-by: Khem Raj + --- plugins/ppp_unix.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/ppp_unix.c b/plugins/ppp_unix.c -index 869066f..5c1e44f 100644 +index 6a20b1a..2e1901f 100644 --- a/plugins/ppp_unix.c +++ b/plugins/ppp_unix.c @@ -21,6 +21,11 @@ @@ -32,5 +33,5 @@ index 869066f..5c1e44f 100644 #include #include -- -2.12.1 +2.16.2 diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb index bf6850b17..83e34b70a 100644 --- a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb @@ -33,6 +33,7 @@ SRC_URI = "ftp://ftp.openl2tp.org/releases/${BP}/${BP}.tar.gz \ file://openl2tpd.service \ file://openl2tpd-enable-tests.patch \ file://run-ptest \ + file://0001-plugins-Remove-redundant-net-headers.patch \ " SRC_URI_append_libc-musl = "\