diff options
| author |   Armin Kuster <akuster808@gmail.com> | 2018-02-25 13:28:48 -0800 |
|---|---|---|
| committer |   Joe MacDonald <joe_macdonald@mentor.com> | 2018-04-06 08:12:20 -0400 |
| commit | 6a392dfd791c148449673b31d2db412a77d3fc4d (patch) | |
| tree | 0952dc10bba19a5d7f002a92f655ec577e2ab404 /meta-networking | |
| parent | 95370f4af5f318d73eab0655664ea452f5f9cb31 (diff) | |
| download | meta-openembedded-6a392dfd791c148449673b31d2db412a77d3fc4d.tar.gz | |
openl2tp: fix compile issue with 4.15 kernel
see: http://errors.yoctoproject.org/Errors/Details/168101/ for errors.
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
| -rw-r--r-- | meta-networking/recipes-protocols/openl2tp/openl2tp/fix_linux_4.15_compile.patch | 44 | ||||
| -rw-r--r-- | meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb | 1 |
2 files changed, 45 insertions, 0 deletions
diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp/fix_linux_4.15_compile.patch b/meta-networking/recipes-protocols/openl2tp/openl2tp/fix_linux_4.15_compile.patch new file mode 100644 index 0000000000..4597df80a8 --- /dev/null +++ b/meta-networking/recipes-protocols/openl2tp/openl2tp/fix_linux_4.15_compile.patch @@ -0,0 +1,44 @@ +This fixes a compile issue introduced with linux kernel 4.15 + +include/linux/in.h:222:8: error: redefinition of 'struct in_pktinfo' +| struct in_pktinfo { + + +Upstream-Status: Pending +Signed-off-by: Armin Kuster <akuster808@gmail.com> + +Index: openl2tp-1.8/plugins/ppp_unix.c +=================================================================== +--- openl2tp-1.8.orig/plugins/ppp_unix.c ++++ openl2tp-1.8/plugins/ppp_unix.c +@@ -25,9 +25,14 @@ + #include <fcntl.h> + #include <sys/types.h> + #include <signal.h> ++#include <linux/version.h> ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + #include <net/ethernet.h> + #include <net/if.h> + #include <netinet/in.h> ++#endif ++ + #include <arpa/inet.h> + #include <sys/stat.h> + #include <unistd.h> +@@ -41,12 +46,12 @@ + #define __user + #endif + #include <sys/ioctl.h> +-#include <linux/if_ether.h> +-#include <linux/if_pppox.h> + #include <linux/ppp_defs.h> + #include <linux/if_ppp.h> ++#include <linux/if_pppox.h> ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + #include <linux/if_pppol2tp.h> +- ++#endif + #include "usl.h" + #include "l2tp_private.h" + diff --git a/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb b/meta-networking/recipes-protocols/openl2tp/openl2tp_1.8.bb index bf6850b17c..1f6b4ded32 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://fix_linux_4.15_compile.patch \ " SRC_URI_append_libc-musl = "\ |