[oe-commits] Tom Rini : rp-pppoe: Resync the 3.8 recipe with oe.dev and cleanup patches

Thu Jul 28 17:38:19 UTC 2011

Module: meta-openembedded.git
Branch: master
Commit: 966b46ed92b5f980823fa8efedfa97e2198c7733
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=966b46ed92b5f980823fa8efedfa97e2198c7733

Author: Tom Rini <tom_rini at mentor.com>
Date:   Thu Jul 28 03:32:59 2011 +0000

rp-pppoe: Resync the 3.8 recipe with oe.dev and cleanup patches

- Update HOMEPAGE (from oe.dev)
- Bump PR to match oe.dev (will sync the next bits back over)
- Add Upstream-Status to all patches and a description to the ones
  missing descriptions.

Signed-off-by: Tom Rini <tom_rini at mentor.com>
Signed-off-by: Koen Kooi <koen at dominion.thruhere.net>

---

 .../rp-pppoe/rp-pppoe-3.8/configure_in_cross.patch |    6 ++++++
 .../rp-pppoe-3.8/dont-swallow-errors.patch         |    4 ++++
 .../rp-pppoe-3.8/pppoe-src-restrictions.patch      |    2 ++
 .../rp-pppoe/rp-pppoe-3.8/top-autoconf.patch       |    2 ++
 .../rp-pppoe/rp-pppoe-3.8/update-config.patch      |    2 ++
 .../rp-pppoe/rp-pppoe-3.8/use-ldflags.patch        |    4 ++++
 .../recipes-connectivity/rp-pppoe/rp-pppoe_3.8.bb  |    6 +++---
 7 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/configure_in_cross.patch b/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/configure_in_cross.patch
index 381a44d..1896759 100644
--- a/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/configure_in_cross.patch
+++ b/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/configure_in_cross.patch
@@ -1,3 +1,9 @@
+Update the configure script to cross-compiling with OE.  This hard-codes
+a few target paths, reworks a few tests to be more friendly for cross
+and drops other tests.
+
+Upstream-Status: Inappropriate [build system specific changes]
+
 Index: src/configure.in
 ===================================================================
 --- rp-pppoe-3.8.orig/src/configure.in	2006-04-03 00:29:42.000000000 +1000
diff --git a/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/dont-swallow-errors.patch b/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/dont-swallow-errors.patch
index 81ce2db..c7fc9cf 100644
--- a/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/dont-swallow-errors.patch
+++ b/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/dont-swallow-errors.patch
@@ -1,3 +1,7 @@
+Further fixup to the configure scripts to not swallow errors
+
+Upstream-Status: Pending
+
 --- a/src/configure.in.org	2008-01-14 21:08:38.000000000 +0200
 +++ a/src/configure.in	2008-01-14 21:20:09.000000000 +0200
 @@ -208,7 +208,7 @@
diff --git a/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/pppoe-src-restrictions.patch b/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/pppoe-src-restrictions.patch
index e7e1c2e..bcf4d11 100644
--- a/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/pppoe-src-restrictions.patch
+++ b/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/pppoe-src-restrictions.patch
@@ -3,6 +3,8 @@ Relax restrictions on the PPPoE src address, as per debian bug
 
   http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=293811
 
+Upstream-Status: Inappropriate [Backport from Debian]
+
 --- rp-pppoe-3.8.orig/src/discovery.c
 +++ rp-pppoe-3.8/src/discovery.c
 @@ -376,8 +376,8 @@
diff --git a/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/top-autoconf.patch b/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/top-autoconf.patch
index e3b0482..4fe73d0 100644
--- a/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/top-autoconf.patch
+++ b/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/top-autoconf.patch
@@ -4,6 +4,8 @@ S. This adds enough autoconf at the top level to allow it to be
 called there - all it does is run a sub autoconf stuff in the src
 directory.
 
+Upstream-Status: Inappropriate [build system specific change]
+
 Index: rp-pppoe-3.8/Makefile.am
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
diff --git a/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/update-config.patch b/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/update-config.patch
index 5642e3c..42a3bc6 100644
--- a/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/update-config.patch
+++ b/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/update-config.patch
@@ -6,6 +6,8 @@ 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.
 
+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
diff --git a/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/use-ldflags.patch b/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/use-ldflags.patch
index 1209631..95f6292 100644
--- a/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/use-ldflags.patch
+++ b/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe-3.8/use-ldflags.patch
@@ -1,3 +1,7 @@
+Make the Makefile obey LDFLAGS.
+
+Upstream-Status: Pending
+
 --- a/src/Makefile.in	2006-04-02 18:29:42.000000000 +0400
 +++ b/src/Makefile.in	2010-04-16 17:51:31.000000000 +0400
 @@ -67,16 +67,16 @@ all: $(TARGETS)
diff --git a/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe_3.8.bb b/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe_3.8.bb
index 371d82e..673633a 100644
--- a/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe_3.8.bb
+++ b/meta-oe/recipes-connectivity/rp-pppoe/rp-pppoe_3.8.bb
@@ -1,12 +1,12 @@
 DESCRIPTION = "A user-mode PPPoE client and server suite for Linux"
-HOMEPAGE = "http://www.roaringpenguin.com/en/penguin/openSourceProducts/rpPppoe"
+HOMEPAGE = "http://www.roaringpenguin.com/products/pppoe"
 SECTION = "console/network"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=a194eaefae2be54ee3221339b10d0581"
 RDEPENDS_${PN} = "ppp"
 RDEPENDS_${PN}-server = "${PN}"
 RRECOMMENDS_${PN} = "ppp-oe"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \
            file://top-autoconf.patch \
@@ -14,7 +14,7 @@ SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \
            file://pppoe-src-restrictions.patch \
            file://update-config.patch \
            file://dont-swallow-errors.patch \
-	   file://use-ldflags.patch \
+           file://use-ldflags.patch \
            file://pppoe-server.default \
            file://pppoe-server.init"
 



