diff options
| author |   Armin Kuster <akuster808@gmail.com> | 2018-04-07 15:49:45 -0700 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:40 -0700 |
| commit | 268e9ef7206b8fb959099510da960f54639a0be0 (patch) | |
| tree | e467741ef4459b85248272d44f60ebd7c9819619 /meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch | |
| parent | 68c8fe1aba92ca2ed5e1156fa0050609ab4f73af (diff) | |
| download | meta-openembedded-contrib-268e9ef7206b8fb959099510da960f54639a0be0.tar.gz | |
rp-pppoe: refresh patches
WARNING:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
checking file src/discovery.c
Hunk #1 succeeded at 472 with fuzz 1 (offset 96 lines)
among others
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch')
| -rw-r--r-- | meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch index 42a3bc62c8..c759e09aa0 100644 --- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch +++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe-3.12/update-config.patch @@ -1,3 +1,8 @@ +From 4d34e0d7d790ec41b0afb731c7dc1b1ee90dd377 Mon Sep 17 00:00:00 2001 +From: Tom Rini <tom_rini@mentor.com> +Date: Wed, 27 Jul 2011 03:46:52 +0000 +Subject: [PATCH] rp-pppoe: Port from oe.dev + Set the timeout to 0 since we don't want pppoe to try reconnecting, we want whatever is calling it to reconnect. Lots of odd things happen when you have pppoe retrying itself. @@ -8,11 +13,15 @@ ppp looks, so that's what we do here. Upstream-Status: Inappropriate [configuration] -Index: rp-pppoe-3.8/configs/pppoe.conf -=================================================================== ---- rp-pppoe-3.8.orig/configs/pppoe.conf 2006-04-03 00:29:41.000000000 +1000 -+++ rp-pppoe-3.8/configs/pppoe.conf 2007-06-08 16:02:47.000000000 +1000 -@@ -66,7 +66,7 @@ +--- + configs/pppoe.conf | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configs/pppoe.conf b/configs/pppoe.conf +index c222b2f..65618a5 100644 +--- a/configs/pppoe.conf ++++ b/configs/pppoe.conf +@@ -66,7 +66,7 @@ DEFAULTROUTE=yes # to connect forever after pppoe-start is called. Otherwise, it will # give out after CONNECT_TIMEOUT seconds and will not attempt to # connect again, making it impossible to reach. @@ -21,7 +30,7 @@ Index: rp-pppoe-3.8/configs/pppoe.conf # How often in seconds pppoe-start polls to check if link is up CONNECT_POLL=2 -@@ -115,7 +115,7 @@ +@@ -115,7 +115,7 @@ PPPOE_TIMEOUT=80 FIREWALL=NONE # Linux kernel-mode plugin for pppd. If you want to try the kernel-mode |