diff options
author | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-02-28 09:48:21 +0200 |
---|---|---|
committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2017-03-14 18:43:55 +0000 |
commit | 58f1b8ec51423c1d1b24e208748b6df5fec90bc9 (patch) | |
tree | 3dec84aae9d8938ef798b82e026115a6952e64ec /recipes/ppp/files/ppp-fix-building-with-linux-4.8.patch | |
parent | ac8252cb32d1293c19963dbcf5d1902f807e78bd (diff) | |
download | meta-boot2qt-58f1b8ec51423c1d1b24e208748b6df5fec90bc9.tar.gz |
ppp: correctly patch building with linux kernel 4.8 and newer
poky/meta/recipes-connectivity/ppp module has patch included in morty
branch that fixes build errors with kernel version 4.8 and up. However,
this breaks builds with older kernels. Apply patch from ppp github fork
that correctly addresses this issue and fixes the module building.
Change-Id: I2c36c10464f7d28ca2543ec8fbf0164aace5c07a
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes/ppp/files/ppp-fix-building-with-linux-4.8.patch')
-rw-r--r-- | recipes/ppp/files/ppp-fix-building-with-linux-4.8.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/recipes/ppp/files/ppp-fix-building-with-linux-4.8.patch b/recipes/ppp/files/ppp-fix-building-with-linux-4.8.patch new file mode 100644 index 0000000..17e7975 --- /dev/null +++ b/recipes/ppp/files/ppp-fix-building-with-linux-4.8.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h | ||
2 | index 9ab2eee..96d2794 100644 | ||
3 | --- a/pppd/plugins/rp-pppoe/pppoe.h | ||
4 | +++ b/pppd/plugins/rp-pppoe/pppoe.h | ||
5 | @@ -47,6 +47,10 @@ | ||
6 | #include <sys/socket.h> | ||
7 | #endif | ||
8 | |||
9 | +/* This has to be included before Linux 4.8's linux/in.h | ||
10 | + * gets dragged in. */ | ||
11 | +#include <netinet/in.h> | ||
12 | + | ||
13 | /* Ugly header files on some Linux boxes... */ | ||
14 | #if defined(HAVE_LINUX_IF_H) | ||
15 | #include <linux/if.h> | ||
16 | @@ -84,7 +88,6 @@ typedef unsigned long UINT32_t; | ||
17 | #include <linux/if_ether.h> | ||
18 | #endif | ||
19 | |||
20 | -#include <netinet/in.h> | ||
21 | |||
22 | #ifdef HAVE_NETINET_IF_ETHER_H | ||
23 | #include <sys/types.h> | ||