summaryrefslogtreecommitdiffstats
path: root/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-05-23 00:31:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-24 08:51:38 +0100
commitdd429885189761c264f8d626524c6a02bf148801 (patch)
tree793232335f0e2ced23ec645602503042cae97c15 /meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
parentfce38e581faf92871df41c6d829753a183e76acc (diff)
downloadpoky-dd429885189761c264f8d626524c6a02bf148801.tar.gz
ppp: avoid host contamination
* Import patch from OE-Classic commit f7c547ede1bfc94c24f6315a23ff48a4c5b9ffaf. * Fixes linking with libpcap (ppp filter). (From OE-Core rev: ba1539f165470d6ee9b7b95b5067792e384e6aea) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch')
-rw-r--r--meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch16
1 files changed, 16 insertions, 0 deletions
diff --git a/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
index 8cc354af97..d59717ebd3 100644
--- a/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
+++ b/meta/recipes-connectivity/ppp/ppp-2.4.5/makefile-remove-hard-usr-reference.patch
@@ -1,6 +1,9 @@
1The patch comes from OpenEmbedded. 1The patch comes from OpenEmbedded.
2Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com> 2Rebased for ppp-2.4.5. Dongxiao Xu <dongxiao.xu@intel.com>
3 3
4Updated from OE-Classic to include the pcap hunk.
5Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
6
4Upstream-Status: Inappropriate [configuration] 7Upstream-Status: Inappropriate [configuration]
5 8
6diff -urN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux 9diff -urN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux
@@ -19,3 +22,16 @@ diff -urN ppp-2.4.5-orig/pppd/Makefile.linux ppp-2.4.5/pppd/Makefile.linux
19 22
20 ifdef NEEDDES 23 ifdef NEEDDES
21 ifndef USE_CRYPT 24 ifndef USE_CRYPT
25@@ -169,10 +169,10 @@
26 endif
27
28 ifdef FILTER
29-ifneq ($(wildcard /usr/include/pcap-bpf.h),)
30+#ifneq ($(wildcard /usr/include/pcap-bpf.h),)
31 LIBS += -lpcap
32 CFLAGS += -DPPP_FILTER
33-endif
34+#endif
35 endif
36
37 ifdef HAVE_INET6