summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2016-10-14 08:50:11 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-10-15 10:01:43 +0100
commit8d3a2726f6725977d83dc71a5cd08ba9a062001b (patch)
tree4cd2c4e6b681d87f116460b911d92b3d6e4b52e3 /meta
parent21d5c58a1e8832105116c20732635c89ac25cae8 (diff)
downloadpoky-8d3a2726f6725977d83dc71a5cd08ba9a062001b.tar.gz
ppp: fix building with linux-4.8
Fix a build error when using the linux-4.8 headers that results in: In file included from pppoe.h:87:0, from plugin.c:29: ../usr/include/netinet/in.h:211:8: note: originally defined here struct in6_addr ^~~~~~~~ In file included from ../usr/include/linux/if_pppol2tp.h:20:0, from ../usr/include/linux/if_pppox.h:26, from plugin.c:52: ../usr/include/linux/in6.h:49:8: error: redefinition of 'struct sockaddr_in6' struct sockaddr_in6 { ^~~~~~~~~~~~ (From OE-Core rev: 68e917aa778742da104c038a6e1ffa789fe95410) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch44
-rw-r--r--meta/recipes-connectivity/ppp/ppp_2.4.7.bb1
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch b/meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch
new file mode 100644
index 0000000000..f77b0defc5
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp/ppp-fix-building-with-linux-4.8.patch
@@ -0,0 +1,44 @@
1From 3da19af53e2eee2e77b456cfbb9d633b06656d38 Mon Sep 17 00:00:00 2001
2From: Jackie Huang <jackie.huang@windriver.com>
3Date: Thu, 13 Oct 2016 13:41:43 +0800
4Subject: [PATCH] ppp: fix building with linux-4.8
5
6Fix a build error when using the linux-4.8 headers that results in:
7
8In file included from pppoe.h:87:0,
9 from plugin.c:29:
10../usr/include/netinet/in.h:211:8: note: originally defined here
11 struct in6_addr
12 ^~~~~~~~
13In file included from ../usr/include/linux/if_pppol2tp.h:20:0,
14 from ../usr/include/linux/if_pppox.h:26,
15 from plugin.c:52:
16../usr/include/linux/in6.h:49:8: error: redefinition of 'struct sockaddr_in6'
17 struct sockaddr_in6 {
18 ^~~~~~~~~~~~
19
20Upstream-Status: Submitted [1]
21
22[1] https://github.com/paulusmack/ppp/pull/69
23
24Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
25---
26 pppd/plugins/rp-pppoe/pppoe.h | 2 +-
27 1 file changed, 1 insertion(+), 1 deletion(-)
28
29diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h
30index 9ab2eee..96d2794 100644
31--- a/pppd/plugins/rp-pppoe/pppoe.h
32+++ b/pppd/plugins/rp-pppoe/pppoe.h
33@@ -84,7 +84,7 @@ typedef unsigned long UINT32_t;
34 #include <linux/if_ether.h>
35 #endif
36
37-#include <netinet/in.h>
38+#include <linux/in.h>
39
40 #ifdef HAVE_NETINET_IF_ETHER_H
41 #include <sys/types.h>
42--
432.8.3
44
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
index 4437b5c519..56dbd98d24 100644
--- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
+++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
@@ -30,6 +30,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
30 file://0001-ppp-Fix-compilation-errors-in-Makefile.patch \ 30 file://0001-ppp-Fix-compilation-errors-in-Makefile.patch \
31 file://ppp@.service \ 31 file://ppp@.service \
32 file://fix-CVE-2015-3310.patch \ 32 file://fix-CVE-2015-3310.patch \
33 file://ppp-fix-building-with-linux-4.8.patch \
33" 34"
34 35
35SRC_URI_append_libc-musl = "\ 36SRC_URI_append_libc-musl = "\