summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-12-28 16:45:44 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-09 13:39:12 +0000
commitb235f4db205d614bd2927a936048402608701021 (patch)
tree71218d2eee8ab0c6fbc51f5ccb24dde29bcede38 /meta
parentde1a1cf76e22246bc772f584142e0de357f196eb (diff)
downloadpoky-b235f4db205d614bd2927a936048402608701021.tar.gz
ppp: Partly remove patch that doesn't make sense any more
ppp no longer provides the duplicate if_pppox.h header so no need to patch that out of the Makefile. (From OE-Core rev: 015574ac9335799e0a3da00cf882b103177c3744) 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')
-rw-r--r--meta/recipes-connectivity/ppp/ppp/0001-ppp-Fix-compilation-errors-in-Makefile.patch51
1 files changed, 3 insertions, 48 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp/0001-ppp-Fix-compilation-errors-in-Makefile.patch b/meta/recipes-connectivity/ppp/ppp/0001-ppp-Fix-compilation-errors-in-Makefile.patch
index 8aa2d2e678..ea4969b366 100644
--- a/meta/recipes-connectivity/ppp/ppp/0001-ppp-Fix-compilation-errors-in-Makefile.patch
+++ b/meta/recipes-connectivity/ppp/ppp/0001-ppp-Fix-compilation-errors-in-Makefile.patch
@@ -3,34 +3,14 @@ From: Lu Chong <Chong.Lu@windriver.com>
3Date: Tue, 5 Nov 2013 17:32:56 +0800 3Date: Tue, 5 Nov 2013 17:32:56 +0800
4Subject: [PATCH] ppp: Fix compilation errors in Makefile 4Subject: [PATCH] ppp: Fix compilation errors in Makefile
5 5
6This patch fixes below issues: 6Make can't exit while compilation error occurs in subdir for plugins building.
7
81. Make can't exit while compilation error occurs in subdir for plugins building.
9
102. If build ppp with newer kernel (3.10.10), it will pick 'if_pppox.h' from sysroot-dir and
11 'if_pppol2tp.h' from its own source dir, this cause below build errors:
12
13 bitbake_build/tmp/sysroots/intel-x86-64/usr/include/linux/if_pppox.h:84:26:
14 error: field 'pppol2tp' has incomplete type
15 struct pppol2tpin6_addr pppol2tp;
16 ^
17 bitbake_build/tmp/sysroots/intel-x86-64/usr/include/linux/if_pppox.h:99:28:
18 error: field 'pppol2tp' has incomplete type
19 struct pppol2tpv3in6_addr pppol2tp;
20 ^
21
22The 'sysroot-dir/if_pppox.h' enabled ipv6 support but the 'source-dir/if_pppol2tp.h' lost
23related structure definitions, we should use both header files from sysroots to fix this
24build failure.
25 7
26Upstream-Status: Pending 8Upstream-Status: Pending
27 9
28Signed-off-by: Lu Chong <Chong.Lu@windriver.com> 10Signed-off-by: Lu Chong <Chong.Lu@windriver.com>
29--- 11---
30 pppd/plugins/Makefile.linux | 2 +- 12 pppd/plugins/Makefile.linux | 1 +-
31 pppd/plugins/pppol2tp/Makefile.linux | 2 +- 13 1 files changed, 1 insertions(+), 1 deletions(-)
32 pppd/plugins/rp-pppoe/Makefile.linux | 2 +-
33 3 files changed, 3 insertions(+), 3 deletions(-)
34 14
35diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux 15diff --git a/pppd/plugins/Makefile.linux b/pppd/plugins/Makefile.linux
36index 0a7ec7b..2a2c15a 100644 16index 0a7ec7b..2a2c15a 100644
@@ -45,31 +25,6 @@ index 0a7ec7b..2a2c15a 100644
45 25
46 %.so: %.c 26 %.so: %.c
47 $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^ 27 $(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^
48diff --git a/pppd/plugins/pppol2tp/Makefile.linux b/pppd/plugins/pppol2tp/Makefile.linux
49index 19eff67..feb2f52 100644
50--- a/pppd/plugins/pppol2tp/Makefile.linux
51+++ b/pppd/plugins/pppol2tp/Makefile.linux
52@@ -1,6 +1,6 @@
53 #CC = gcc
54 COPTS = -O2 -g
55-CFLAGS = $(COPTS) -I. -I../.. -I../../../include -fPIC
56+CFLAGS = $(COPTS) -I. -I../.. -fPIC
57 LDFLAGS = -shared
58 INSTALL = install
59
60diff --git a/pppd/plugins/rp-pppoe/Makefile.linux b/pppd/plugins/rp-pppoe/Makefile.linux
61index f078991..15b9118 100644
62--- a/pppd/plugins/rp-pppoe/Makefile.linux
63+++ b/pppd/plugins/rp-pppoe/Makefile.linux
64@@ -26,7 +26,7 @@ INSTALL = install
65 RP_VERSION=3.8p
66
67 COPTS=-O2 -g
68-CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
69+CFLAGS=$(COPTS) '-DRP_VERSION="$(RP_VERSION)"'
70 all: rp-pppoe.so pppoe-discovery
71
72 pppoe-discovery: pppoe-discovery.o debug.o
73-- 28--
741.7.9.5 291.7.9.5
75 30