diff options
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 381a44d30..189675942 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 @@ | |||
1 | Update the configure script to cross-compiling with OE. This hard-codes | ||
2 | a few target paths, reworks a few tests to be more friendly for cross | ||
3 | and drops other tests. | ||
4 | |||
5 | Upstream-Status: Inappropriate [build system specific changes] | ||
6 | |||
1 | Index: src/configure.in | 7 | Index: src/configure.in |
2 | =================================================================== | 8 | =================================================================== |
3 | --- rp-pppoe-3.8.orig/src/configure.in 2006-04-03 00:29:42.000000000 +1000 | 9 | --- 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 81ce2db33..c7fc9cfac 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 @@ | |||
1 | Further fixup to the configure scripts to not swallow errors | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
1 | --- a/src/configure.in.org 2008-01-14 21:08:38.000000000 +0200 | 5 | --- a/src/configure.in.org 2008-01-14 21:08:38.000000000 +0200 |
2 | +++ a/src/configure.in 2008-01-14 21:20:09.000000000 +0200 | 6 | +++ a/src/configure.in 2008-01-14 21:20:09.000000000 +0200 |
3 | @@ -208,7 +208,7 @@ | 7 | @@ -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 e7e1c2ee3..bcf4d1164 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 | |||
3 | 3 | ||
4 | http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=293811 | 4 | http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=293811 |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [Backport from Debian] | ||
7 | |||
6 | --- rp-pppoe-3.8.orig/src/discovery.c | 8 | --- rp-pppoe-3.8.orig/src/discovery.c |
7 | +++ rp-pppoe-3.8/src/discovery.c | 9 | +++ rp-pppoe-3.8/src/discovery.c |
8 | @@ -376,8 +376,8 @@ | 10 | @@ -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 e3b048298..4fe73d017 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 | |||
4 | called there - all it does is run a sub autoconf stuff in the src | 4 | called there - all it does is run a sub autoconf stuff in the src |
5 | directory. | 5 | directory. |
6 | 6 | ||
7 | Upstream-Status: Inappropriate [build system specific change] | ||
8 | |||
7 | Index: rp-pppoe-3.8/Makefile.am | 9 | Index: rp-pppoe-3.8/Makefile.am |
8 | =================================================================== | 10 | =================================================================== |
9 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | 11 | --- /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 5642e3cfe..42a3bc62c 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 | |||
6 | ppp's plugin lib directory. If no path is specified then that's where | 6 | ppp's plugin lib directory. If no path is specified then that's where |
7 | ppp looks, so that's what we do here. | 7 | ppp looks, so that's what we do here. |
8 | 8 | ||
9 | Upstream-Status: Inappropriate [configuration] | ||
10 | |||
9 | Index: rp-pppoe-3.8/configs/pppoe.conf | 11 | Index: rp-pppoe-3.8/configs/pppoe.conf |
10 | =================================================================== | 12 | =================================================================== |
11 | --- rp-pppoe-3.8.orig/configs/pppoe.conf 2006-04-03 00:29:41.000000000 +1000 | 13 | --- 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 120963133..95f629298 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 @@ | |||
1 | Make the Makefile obey LDFLAGS. | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
1 | --- a/src/Makefile.in 2006-04-02 18:29:42.000000000 +0400 | 5 | --- a/src/Makefile.in 2006-04-02 18:29:42.000000000 +0400 |
2 | +++ b/src/Makefile.in 2010-04-16 17:51:31.000000000 +0400 | 6 | +++ b/src/Makefile.in 2010-04-16 17:51:31.000000000 +0400 |
3 | @@ -67,16 +67,16 @@ all: $(TARGETS) | 7 | @@ -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 371d82eac..673633a08 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 @@ | |||
1 | DESCRIPTION = "A user-mode PPPoE client and server suite for Linux" | 1 | DESCRIPTION = "A user-mode PPPoE client and server suite for Linux" |
2 | HOMEPAGE = "http://www.roaringpenguin.com/en/penguin/openSourceProducts/rpPppoe" | 2 | HOMEPAGE = "http://www.roaringpenguin.com/products/pppoe" |
3 | SECTION = "console/network" | 3 | SECTION = "console/network" |
4 | LICENSE = "GPLv2" | 4 | LICENSE = "GPLv2" |
5 | LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=a194eaefae2be54ee3221339b10d0581" | 5 | LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=a194eaefae2be54ee3221339b10d0581" |
6 | RDEPENDS_${PN} = "ppp" | 6 | RDEPENDS_${PN} = "ppp" |
7 | RDEPENDS_${PN}-server = "${PN}" | 7 | RDEPENDS_${PN}-server = "${PN}" |
8 | RRECOMMENDS_${PN} = "ppp-oe" | 8 | RRECOMMENDS_${PN} = "ppp-oe" |
9 | PR = "r7" | 9 | PR = "r8" |
10 | 10 | ||
11 | SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \ | 11 | SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \ |
12 | file://top-autoconf.patch \ | 12 | file://top-autoconf.patch \ |
@@ -14,7 +14,7 @@ SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \ | |||
14 | file://pppoe-src-restrictions.patch \ | 14 | file://pppoe-src-restrictions.patch \ |
15 | file://update-config.patch \ | 15 | file://update-config.patch \ |
16 | file://dont-swallow-errors.patch \ | 16 | file://dont-swallow-errors.patch \ |
17 | file://use-ldflags.patch \ | 17 | file://use-ldflags.patch \ |
18 | file://pppoe-server.default \ | 18 | file://pppoe-server.default \ |
19 | file://pppoe-server.init" | 19 | file://pppoe-server.init" |
20 | 20 | ||