summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-12-28 16:45:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-09 13:39:12 +0000
commit81339d0113a9aafd4cce878f30071a3c1a8e2dcf (patch)
tree6b7b1b3906c925dd9406ffba315d06424eb52019 /meta/recipes-connectivity
parentb235f4db205d614bd2927a936048402608701021 (diff)
downloadpoky-81339d0113a9aafd4cce878f30071a3c1a8e2dcf.tar.gz
ppp: Add patch to fix build with musl and 4.9 headers
Removing unused includes fixes the build. Fixes [YOCTO #10853]. (From OE-Core rev: c580d2938286d62d092496e699f12b03fa065546) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity')
-rw-r--r--meta/recipes-connectivity/ppp/ppp/0001-ppp-Remove-unneeded-include.patch43
-rw-r--r--meta/recipes-connectivity/ppp/ppp_2.4.7.bb1
2 files changed, 44 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp/0001-ppp-Remove-unneeded-include.patch b/meta/recipes-connectivity/ppp/ppp/0001-ppp-Remove-unneeded-include.patch
new file mode 100644
index 0000000000..a32f89fbc8
--- /dev/null
+++ b/meta/recipes-connectivity/ppp/ppp/0001-ppp-Remove-unneeded-include.patch
@@ -0,0 +1,43 @@
1commit cd90fd147844a0cfec101f1e2db7a3c59d236621
2Author: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Wed Dec 28 14:11:22 2016 +0200
4
5pppol2tp plugin: Remove unneeded include
6
7The include is not required and will break compile on musl libc with
8
9| In file included from pppol2tp.c:34:0:
10| /usr/include/linux/if.h:97:2: error: expected identifier before numeric constant
11| IFF_LOWER_UP = 1<<16, /* __volatile__ */
12
13Patch originally from Khem Raj.
14
15Upstream-Status: Pending [https://github.com/paulusmack/ppp/issues/73]
16Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
17
18diff --git a/pppd/plugins/pppol2tp/openl2tp.c b/pppd/plugins/pppol2tp/openl2tp.c
19index 9643b96..458316b 100644
20--- a/pppd/plugins/pppol2tp/openl2tp.c
21+++ b/pppd/plugins/pppol2tp/openl2tp.c
22@@ -47,7 +47,6 @@
23 #include <linux/if_ether.h>
24 #include <linux/ppp_defs.h>
25 #include <linux/if_ppp.h>
26-#include <linux/if_pppox.h>
27 #include <linux/if_pppol2tp.h>
28
29 #include "l2tp_event.h"
30diff --git a/pppd/plugins/pppol2tp/pppol2tp.c b/pppd/plugins/pppol2tp/pppol2tp.c
31index 0e28606..4f6d98c 100644
32--- a/pppd/plugins/pppol2tp/pppol2tp.c
33+++ b/pppd/plugins/pppol2tp/pppol2tp.c
34@@ -46,7 +46,6 @@
35 #include <linux/if_ether.h>
36 #include <linux/ppp_defs.h>
37 #include <linux/if_ppp.h>
38-#include <linux/if_pppox.h>
39 #include <linux/if_pppol2tp.h>
40
41 /* should be added to system's socket.h... */
42---
43
diff --git a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
index 56dbd98d24..86ada698c5 100644
--- a/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
+++ b/meta/recipes-connectivity/ppp/ppp_2.4.7.bb
@@ -31,6 +31,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
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 file://ppp-fix-building-with-linux-4.8.patch \
34 file://0001-ppp-Remove-unneeded-include.patch \
34" 35"
35 36
36SRC_URI_append_libc-musl = "\ 37SRC_URI_append_libc-musl = "\