From 612f7ecab32c79e28074e1a56184df7068bdbf9c Mon Sep 17 00:00:00 2001 From: Jamie Lenehan Date: Fri, 8 Jun 2007 06:13:53 +0000 Subject: rp-pppoe 3.8: Fix issues caused by autoconf needing to run in the src subdirectory of the source code. The OE autotools.bbclass runs the autoconf stuff in ${S}, so you need to change ${S} to the src subdirectory to get it to work. But ${S} is also where patches are appplied, so you can't patch the config files and other things which aren't in the src directory. So add some autoconf at the top level which just says there's a sub-autoconf project in the src subdirectory, fix up the patches, remove the sed hacks and add a new patch to do what the sed hacks were doing before. --- packages/rp-pppoe/rp-pppoe-3.8/update-config.patch | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 packages/rp-pppoe/rp-pppoe-3.8/update-config.patch (limited to 'packages/rp-pppoe/rp-pppoe-3.8/update-config.patch') diff --git a/packages/rp-pppoe/rp-pppoe-3.8/update-config.patch b/packages/rp-pppoe/rp-pppoe-3.8/update-config.patch new file mode 100644 index 0000000000..5642e3cfee --- /dev/null +++ b/packages/rp-pppoe/rp-pppoe-3.8/update-config.patch @@ -0,0 +1,30 @@ +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. + +The path for the plugin is wrong, it's now part of ppp and is in a +ppp's plugin lib directory. If no path is specified then that's where +ppp looks, so that's what we do here. + +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 @@ + # 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. +-CONNECT_TIMEOUT=30 ++CONNECT_TIMEOUT=0 + + # How often in seconds pppoe-start polls to check if link is up + CONNECT_POLL=2 +@@ -115,7 +115,7 @@ + FIREWALL=NONE + + # Linux kernel-mode plugin for pppd. If you want to try the kernel-mode +-# plugin, use LINUX_PLUGIN=/etc/ppp/plugins/rp-pppoe.so ++# plugin, use LINUX_PLUGIN=rp-pppoe.so + LINUX_PLUGIN= + + # Any extra arguments to pass to pppoe. Normally, use a blank string -- cgit v1.2.3