summaryrefslogtreecommitdiffstats
path: root/recipes
diff options
context:
space:
mode:
authorMikko Gronoff <mikko.gronoff@qt.io>2017-12-21 13:23:57 +0200
committerMikko Gronoff <mikko.gronoff@qt.io>2017-12-21 12:18:24 +0000
commit46c489c7bddb6a7fed0beceb0d51bb4c93c64f5b (patch)
tree6bf495419ca1eb3d7e0645df6006d5bd3b75a415 /recipes
parente17fe673b470d692ebd9b70f07ac06cf2f6a79bd (diff)
downloadmeta-boot2qt-46c489c7bddb6a7fed0beceb0d51bb4c93c64f5b.tar.gz
ppp: remove obsolete patch
Available via poky (commit 97d7e4ca751e6010da97e7f082dd13230fe3ef10 in morty branch) since latest poky revision update. Change-Id: I30818f49622037fc96d3af144eb94f78caf32494 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes')
-rw-r--r--recipes/ppp/files/ppp-fix-building-with-linux-4.8.patch23
-rw-r--r--recipes/ppp/ppp_2.%.bbappend30
2 files changed, 0 insertions, 53 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
deleted file mode 100644
index 17e7975..0000000
--- a/recipes/ppp/files/ppp-fix-building-with-linux-4.8.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h
2index 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>
diff --git a/recipes/ppp/ppp_2.%.bbappend b/recipes/ppp/ppp_2.%.bbappend
deleted file mode 100644
index d687518..0000000
--- a/recipes/ppp/ppp_2.%.bbappend
+++ /dev/null
@@ -1,30 +0,0 @@
1############################################################################
2##
3## Copyright (C) 2017 The Qt Company Ltd.
4## Contact: https://www.qt.io/licensing/
5##
6## This file is part of the Boot to Qt meta layer.
7##
8## $QT_BEGIN_LICENSE:GPL$
9## Commercial License Usage
10## Licensees holding valid commercial Qt licenses may use this file in
11## accordance with the commercial license agreement provided with the
12## Software or, alternatively, in accordance with the terms contained in
13## a written agreement between you and The Qt Company. For licensing terms
14## and conditions see https://www.qt.io/terms-conditions. For further
15## information use the contact form at https://www.qt.io/contact-us.
16##
17## GNU General Public License Usage
18## Alternatively, this file may be used under the terms of the GNU
19## General Public License version 3 or (at your option) any later version
20## approved by the KDE Free Qt Foundation. The licenses are as published by
21## the Free Software Foundation and appearing in the file LICENSE.GPL3
22## included in the packaging of this file. Please review the following
23## information to ensure the GNU General Public License requirements will
24## be met: https://www.gnu.org/licenses/gpl-3.0.html.
25##
26## $QT_END_LICENSE$
27##
28############################################################################
29
30FILESEXTRAPATHS_prepend := "${THISDIR}/files:"