sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Jussi Kukkonen 2016-12-28 16:45:45 +02:00 committed by Richard Purdie
parent b235f4db20
commit 81339d0113
2 changed files with 44 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
meta/recipes-connectivity/ppp/ppp/0001-ppp-Remove-unneeded-include.patch Normal file
View File

@ -0,0 +1,43 @@
commit cd90fd147844a0cfec101f1e2db7a3c59d236621
Author: Jussi Kukkonen <jussi.kukkonen@intel.com>
Date: Wed Dec 28 14:11:22 2016 +0200
pppol2tp plugin: Remove unneeded include
The include is not required and will break compile on musl libc with
| In file included from pppol2tp.c:34:0:
| /usr/include/linux/if.h:97:2: error: expected identifier before numeric constant
| IFF_LOWER_UP = 1<<16, /* __volatile__ */
Patch originally from Khem Raj.
Upstream-Status: Pending [https://github.com/paulusmack/ppp/issues/73]
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
diff --git a/pppd/plugins/pppol2tp/openl2tp.c b/pppd/plugins/pppol2tp/openl2tp.c
index 9643b96..458316b 100644
--- a/pppd/plugins/pppol2tp/openl2tp.c
+++ b/pppd/plugins/pppol2tp/openl2tp.c
@@ -47,7 +47,6 @@
#include <linux/if_ether.h>
#include <linux/ppp_defs.h>
#include <linux/if_ppp.h>
-#include <linux/if_pppox.h>
#include <linux/if_pppol2tp.h>
#include "l2tp_event.h"
diff --git a/pppd/plugins/pppol2tp/pppol2tp.c b/pppd/plugins/pppol2tp/pppol2tp.c
index 0e28606..4f6d98c 100644
--- a/pppd/plugins/pppol2tp/pppol2tp.c
+++ b/pppd/plugins/pppol2tp/pppol2tp.c
@@ -46,7 +46,6 @@
#include <linux/if_ether.h>
#include <linux/ppp_defs.h>
#include <linux/if_ppp.h>
-#include <linux/if_pppox.h>
#include <linux/if_pppol2tp.h>
/* should be added to system's socket.h... */
---

1
meta/recipes-connectivity/ppp/ppp_2.4.7.bb
View File

@ -31,6 +31,7 @@ SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
file://ppp@.service \
file://fix-CVE-2015-3310.patch \
file://ppp-fix-building-with-linux-4.8.patch \
file://0001-ppp-Remove-unneeded-include.patch \
"
SRC_URI_append_libc-musl = "\